stagefright: Fix videot thumbnail retrival for wmv

We override some h/w decoders in video configure
since we know some h/w decoder does not support
certain types of video. e.g. WMV7/8.
But we did not do that when application retrieving
video frame for thumbnail causing video frame retrieved
is corrupted.

Fix it by calling FFMPEGSoftCodec::overrideComponentName
when we retrieve a single video frame for thumbnail purpose.

Change-Id: I334698c331dfd3d49bb5d8b8e9c1fe381b304179

1 files changed, 10 insertions, 0 deletions

diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp
index c3adac4..5b96040 100644
--- a/media/libstagefright/StagefrightMetadataRetriever.cpp
+++ b/media/libstagefright/StagefrightMetadataRetriever.cpp
@@ -28,6 +28,8 @@
 #include <media/ICrypto.h>
 #include <media/IMediaHTTPService.h>
 
+#include <media/stagefright/FFMPEGSoftCodec.h>
+
 #include <media/stagefright/foundation/ABuffer.h>
 #include <media/stagefright/foundation/ADebug.h>
 #include <media/stagefright/foundation/AMessage.h>
@@ -506,6 +508,14 @@ VideoFrame *StagefrightMetadataRetriever::getFrameAtTime(
 
     for (size_t i = 0; i < matchingCodecs.size(); ++i) {
         const char *componentName = matchingCodecs[i].mName.string();
+        const char *ffmpegComponentName;
+        /* determine whether ffmpeg should override a broken h/w codec */
+        ffmpegComponentName = FFMPEGSoftCodec::overrideComponentName(0, trackMeta, mime, false);
+        if (ffmpegComponentName) {
+            ALOGV("override compoent %s to %s for video frame extraction.", componentName, ffmpegComponentName);
+            componentName = ffmpegComponentName;
+        }
+
         VideoFrame *frame =
             extractVideoFrame(componentName, trackMeta, source, timeUs, option);