OSDN Git Service

FFmpegExtractor: Don't use our extractor when we agree with StageFright
authorChristopher R. Palmer <crpalmer@gmail.com>
Sat, 27 May 2017 18:44:42 +0000 (14:44 -0400)
committerChristopher R. Palmer <crpalmer@gmail.com>
Tue, 30 May 2017 10:18:43 +0000 (06:18 -0400)
commit40898770dd66b011b0a7653e1cd5750f176be038
treea07527123a500eb5328dfb0b0996e1458f4ea44d
parent38460131570b5e60cb90271fdc5991438dd0a391
FFmpegExtractor: Don't use our extractor when we agree with StageFright

Prior to this commit, if StageFright picks mimeType X with any
confidence <= .8 then it uses the StageFright extractors and otherwise
(if ffmpeg recognizes the file format) then it will use the ffmpeg
extractors.

This commit changes the logic to prefer the StageFright extractors
(keeping the behaviour closer to aosp and less dependent on ffmpeg's
implementation) whenever both agree on the same mime type.

Change-Id: I98b1b3c3e94756923106911783104ca42e916aed
extractor/FFmpegExtractor.cpp