Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hrydgard/ppsspp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: codebase7/ppsspp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 5 files changed
  • 1 contributor

Commits on Apr 22, 2014

  1. Resync with upstream and reenable system-wide ffmpeg linking support.

    Was disabled upstream for an unknown reason.
    
    (Can't put the code in an else statement block, make the if statement it's attached to always true before the condition is checked, and expect the code to execute.) (It only does something if the user defines some undocumented cmake options. So really it's hidden anyway, unless the user looks for it.)
    
    Also reenabled the ffmpeg library location messages. (Just so if debugging is needed, we know what ffmpeg we are using. (system or internal.))
    
    Primary reason for this commit: #5772
    (Also I do have a spec file for Mageia, it's why I made this patch in the first place.)
    codebase7 committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    e0d55de View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2014

  1. Merge remote-tracking branch 'upstream/master'

    Rebasing to current master.
    codebase7 committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    8c621c6 View commit details
    Browse the repository at this point in the history
  2. Add the ability to set block_align when constructing a SimpleAudio ob…

    …ject.
    
    This commit modifies SimpleAudio's constructor and Init() functions to allow setting AVCodecContext::block_align when a SimpleAudio object is created. (Default is to set it to zero to keep the original behavior if not needed.)
    
    This seems to be required now with newer versions of ffmpeg (version 2.2+) to init the atrac3+ decoder, as avcodec_open2() will return -22 if it's not set / set to zero.
    codebase7 committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    0109159 View commit details
    Browse the repository at this point in the history
  3. Make BackgroundAudio pass the block alignment to SimpleAudio.

    This allows atrac3+ audio streams to work with ffmpeg 2.2
    codebase7 committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    903e1e8 View commit details
    Browse the repository at this point in the history
  4. Hard-code a block_align value for SimpleAudio in MediaEngine::openCon…

    …text()
    
    This allows some games (Corpse Party, and Crisis Core were tested) to have working atrac3+ audio.
    (The value is 280.)
    
    This value should be computed / pulled from the audio stream, but I don't know enough about the MediaEngine to find where this info could be kept. Some input would be appreciated.
    
    Does not truly fix issue #5772, but it's somewhat a step in the right direction. (If not a hacky one. :P)
    codebase7 committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    b845d61 View commit details
    Browse the repository at this point in the history
  5. Fix undefined behavior if we lack ffmpeg support in SimpleAudio::Open…

    …Codec().
    
    The returned result should be based on an initilized value. (Not that it seems to be checked....)
    codebase7 committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    ed5ae2a View commit details
    Browse the repository at this point in the history
Loading