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: google/ExoPlayer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: release-v2
Choose a base ref
...
head repository: ococococ/ExoPlayer
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.
  • 19 commits
  • 24 files changed
  • 2 contributors

Commits on Feb 9, 2015

  1. Pre 1.2.0 release.

    - Bump version.
    - Remove AC3 renderer. It's not ready.
    ojw28 committed Feb 9, 2015
    Configuration menu
    Copy the full SHA
    33db570 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2015

  1. Merge pull request #294 from google/dev

    dev -> dev-1.2.0-rc
    ojw28 committed Feb 13, 2015
    Configuration menu
    Copy the full SHA
    2f04580 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2015

  1. Merge pull request #297 from google/dev-1.2.0-rc

    dev-1.2.0-rc -> master
    ojw28 committed Feb 16, 2015
    Configuration menu
    Copy the full SHA
    953e111 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #299 from google/dev

    Correctly reset ADTSreader state
    ojw28 committed Feb 16, 2015
    Configuration menu
    Copy the full SHA
    4e02bc6 View commit details
    Browse the repository at this point in the history
  3. Finalize 1.2.1 release.

    ojw28 committed Feb 16, 2015
    Configuration menu
    Copy the full SHA
    407dee2 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2015

  1. Add support for elementary AAC/ADTS streams.

    - This change:
    
    1. Extracts HlsExtractor interface from TsExtractor.
    2. Adds AdtsExtractor for AAC/ADTS streams, which turned out to be
       really easy.
    
    Selection of the ADTS extractor relies on seeing the .aac extension.
    This is at least guaranteed not to break anything that works already
    (since no-one is going to be using .aac as the extension for something
    that's not elementary AAC/ADTS).
    
    Issue: #209
    ojw28 committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    9137962 View commit details
    Browse the repository at this point in the history
  2. Handle the edge case of zero-length chunks.

    Issue: #289
    ojw28 committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    6f897b1 View commit details
    Browse the repository at this point in the history
  3. Fix bad assertion

    ojw28 committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    fb7e48f View commit details
    Browse the repository at this point in the history
  4. Ensure we always seek after selecting a track.

    Some extractor implementations underneath MediaExtractor require a seekTo
    call after tracks are selected to ensure samples are read from the correct
    position. De-duplicating logic was preventing this from happening in some
    cases, causing issues like:
    
    #301
    
    Note that seeking all tracks a side effect of track selection sucks if
    you already have one or more tracks selected, because it introduces
    discontinuities to the already selected tracks. However, in general, it
    *is* necessary to specify the position for the track being selected,
    because the underlying extractor doesn't have enough information to know
    where to start reading from. It can't determine this based on the read
    positions of the already selected tracks, because the samples in these
    tracks might be very sparse with respect to time.
    
    I think a more optimal fix would be to change the SampleExtractor
    interface to receive the current position as an argument to selectTrack.
    For our own extractors, we'd seek the newly selected track to that
    position, whilst the already enabled tracks would be left in their
    current positions (if possible). For FrameworkSampleExtractor we'd
    still have no choice but to call seekTo on the extractor to seek all
    of the tracks. This solution ends up being more complex though, because:
    
    - The SampleExtractor then needs a way of telling DefaultSampleSource
      which tracks were actually seeked, so that the pendingDiscontinuities
      flags can be set correctly.
    - It's a weird API that requires the "current playback position to seek
      only the track being enabled"
    
    So it may not be worth it! I think this fix is definitely good for now,
    in any case.
    
    Issue: #301
    ojw28 committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    c78a00d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5c9a616 View commit details
    Browse the repository at this point in the history
  6. Set version number to 1.2.2

    ojw28 committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    b3a0114 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2015

  1. Update CONTRIBUTING.md

    ojw28 committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    a2476b4 View commit details
    Browse the repository at this point in the history
  2. Update CONTRIBUTING.md

    ojw28 committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    a9d2205 View commit details
    Browse the repository at this point in the history
  3. Fixed issue in CODEC regular expression

    Previous regular expression for extracting codec information was wrong,
    given a line that defines a variant it added information from “CODEC=“
    text to the end of the line (including also information about
    RESOLUTION or alternate rendition groups as part of the CODEC field).
    
    This is not causing a functional problem (at least known by me)
    although is making codecs field storing information that is not related
    with the codec.
    jeoliva authored and ojw28 committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    3e5370f View commit details
    Browse the repository at this point in the history
  4. Fix EIA-608 issues.

    - Data needs to be unescaped before it's passed to SeiReader.
    - SeiReader should loop over potentially multiple child messages.
    - I also changed the sample passed to the EIA-608 renderer so that
      it's the entire sei message payload. The first 8 bytes are
      unnecessary, but it seems nicer conceptually to do it this way.
    
    Issue: #295
    ojw28 committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    11d7e8f View commit details
    Browse the repository at this point in the history
  5. Merge pull request #309 from google/dev-1.2.2-rc

    1.2.2 release
    ojw28 committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    cb03441 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2015

  1. Two small fixes for HLS.

    1. Clear prefixFlags when a NAL unit is found.
    2. continueBuffering should return true if loading is finished.
    ojw28 committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    51dd664 View commit details
    Browse the repository at this point in the history
  2. Set version number to 1.2.3

    ojw28 committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    cc6a29c View commit details
    Browse the repository at this point in the history
  3. Merge pull request #320 from google/dev-1.2.3-rc

    Merge minor release 1.2.3
    ojw28 committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    f506eff View commit details
    Browse the repository at this point in the history
Loading