Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 407ec58c authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "A better fix for the OggExtractor referring to the sample rate while it... 

Merge "A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet." into gingerbread
parents dec43a10 1f7fba1f

media/libstagefright/OggExtractor.cpp

+8 −2
Original line number Diff line number Diff line
@@ -361,11 +361,17 @@ status_t MyVorbisExtractor::readNextPacket(MediaBuffer **out) { 
                memcpy(tmp->data(), buffer->data(), buffer->range_length());

                tmp->set_range(0, buffer->range_length());

                buffer->release();

            } else if (mVi.rate) {

            } else {

                // XXX Not only is this not technically the correct time for

                // this packet, we also stamp every packet in this page

                // with the same time. This needs fixing later.



                if (mVi.rate) {

                    // Rate may not have been initialized yet if we're currently

                    // reading the configuration packets...

                    // Fortunately, the timestamp doesn't matter for those.

                    timeUs = mCurrentPage.mGranulePosition * 1000000ll / mVi.rate;

                }

                tmp->set_range(0, 0);

            }

            buffer = tmp;