summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MP3Extractor.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2009-07-28 10:03:13 -0700
committerAndreas Huber <andih@google.com>2009-07-28 11:28:14 -0700
commit0024245e134467d120b40099da16c467dc365e76 (patch)
treeb4023ffb3f2167dc3303cd048031ad7278643fd9 /media/libstagefright/MP3Extractor.cpp
parent9a92037bd6477533062d635b676a6c9833aab96e (diff)
downloadframeworks_av-0024245e134467d120b40099da16c467dc365e76.zip
frameworks_av-0024245e134467d120b40099da16c467dc365e76.tar.gz
frameworks_av-0024245e134467d120b40099da16c467dc365e76.tar.bz2
Squashed commit of the following:
commit 374ea382ee3a9e3ce17e4c6357fc40d02e362810 Author: Andreas Huber <andih@google.com> Date: Tue Jul 28 09:54:13 2009 -0700 PV's OMX implementation now uses (spec-compliant) microseconds instead of milliseconds in buffer timestamps. commit 8d02f8ab5d7b022ad4ad34db2a9bdeea6ce2acfe Author: Andreas Huber <andih@google.com> Date: Mon Jul 27 14:24:26 2009 -0700 Support for using an overlay for video playback on TI hardware. Appears to be currently constrained to CbYCrY 16-bit colorspace. commit d17f321cb4b15c1fea378f33a7ef5998f23dd0fc Author: Andreas Huber <andih@google.com> Date: Mon Jul 27 09:45:38 2009 -0700 Added '--audio-only' commandline option to stagefright tool. commit d8beef6be5c668c46451446d87e622933371cd75 Author: Andreas Huber <andih@google.com> Date: Fri Jul 24 13:35:00 2009 -0700 Generalize the various workarounds for OMX nodes with their own unique interpretation of the spec. commit c7dfd53eeadf8ed5a39bf2b19b014dcd62f3324d Author: Andreas Huber <andih@google.com> Date: Thu Jul 23 16:06:36 2009 -0700 Fixed erroneous TI AAC decoder behaviour wrt shutdown. The AAC decoder appears to not return out buffers on an Executing->Idle transition, implemented a workaround that does a flush on all ports followed by the Executing->Idle. Oh, and flush with OMX_ALL doesn't properly work either. Fun. commit d6377282e75060881336578f166f9c7feacf3f8f Author: Andreas Huber <andih@google.com> Date: Thu Jul 23 14:06:50 2009 -0700 Apparently the "channels" parameter in AudioTrack's constructor no longer counts channels but is a bitmask of enabled destinations, update the code accordingly. commit ff698c79e851a2e57d362e9c3a09828af4048087 Author: Andreas Huber <andih@google.com> Date: Wed Jul 22 16:54:44 2009 -0700 Fix MPEG4 decoding using TI's hardware decoder that I broke earlier... commit 2ef78bb87cd856eb7f0b3d7dd68782a8650c12bf Author: Andreas Huber <andih@google.com> Date: Wed Jul 22 15:43:18 2009 -0700 Now that the qcom decoder properly advertises its own custom colorspace, update dependent code to reflect this fact. commit bbaec96910727080fd7c8a6907c04facb9f5220f Author: Andreas Huber <andih@google.com> Date: Wed Jul 22 14:32:03 2009 -0700 Finishing up previous, incomplete change. commit 76f14a1ae816b6f434771f8d12bdad81196f351e Author: Andreas Huber <andih@google.com> Date: Wed Jul 22 14:25:17 2009 -0700 The TI video decoder now properly decoder AVC/H.264 content. commit e106130d8c100d5c94603e43864a7a93cca10252 Author: Andreas Huber <andih@google.com> Date: Wed Jul 22 08:56:04 2009 -0700 Experimental support for the TI H.264 decoder, various modifications to OMXDecoder, non-functional still. commit 241c3062dec3447db1a1ee74558cb4b9098fc404 Author: Andreas Huber <andih@google.com> Date: Tue Jul 21 12:13:09 2009 -0700 Enable TI hardware OMX decoders (except for AVC/H.264 which still has issues). This particular set of OMX nodes does not appear to properly return our buffers when sending the "disable" command on a port. Rather it reqires manually flushing that port and _then_ disabling it instead. commit 1c34506a46e32ce25f2a86f3b4250dcfc037356a Author: Andreas Huber <andih@google.com> Date: Tue Jul 21 08:51:35 2009 -0700 Make it simpler to switch between the stagefright player and PVPlayer. commit 249c6de05671d403f8dd51f095d49bf190430c9c Author: Andreas Huber <andih@google.com> Date: Mon Jul 20 14:38:15 2009 -0700 Prepare to use soon-to-be-available hardware decoders in the OMX decoder.
Diffstat (limited to 'media/libstagefright/MP3Extractor.cpp')
-rw-r--r--media/libstagefright/MP3Extractor.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp
index 6b47a38..01cb2d9 100644
--- a/media/libstagefright/MP3Extractor.cpp
+++ b/media/libstagefright/MP3Extractor.cpp
@@ -73,8 +73,6 @@ static bool get_mp3_frame_size(
if (bitrate_index == 0 || bitrate_index == 0x0f) {
// Disallow "free" bitrate.
-
- LOGE("We disallow 'free' bitrate for now.");
return false;
}