Android: enable H264&VP8 HW accelerator for MediaRecorder

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/ffmpeg_demuxer.h"
 
 #include <algorithm>
 #include <memory>
 #include <set>
 #include <utility>
@@ skipping 644 matching lines @@
     base::ResetAndReturn(&read_cb_).Run(kAborted, nullptr);
     return;
   }
 
   SatisfyPendingRead();
 }
 
 void FFmpegDemuxerStream::EnableBitstreamConverter() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if BUILDFLAG(USE_PROPRIETARY_CODECS) || defined(OS_ANDROID)

[DaleCurtis, 2017/04/21 16:43:03]

I'm pretty sure this is wrong, why would you need this?

[braveyao, 2017/04/21 16:58:53]

But I do hit the "NOTREACHED()" check below. A test did moment ago gets the log
as:
chromium: [FATAL:ffmpeg_demuxer.cc(668)] Check failed: false. Proprietary codecs
not enabled.

The proprietary codecs, e.g. OpenH264, is not available on android. We need work
around it to utilize MediaCodec to play back H264 recording.

[braveyao, 2017/04/21 18:09:45]

Done.

   InitBitstreamConverter();
 #else
   NOTREACHED() << "Proprietary codecs not enabled.";
 #endif
 }
 
 void FFmpegDemuxerStream::ResetBitstreamConverter() {
 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
   if (bitstream_converter_)
     InitBitstreamConverter();
@@ skipping 1192 matching lines @@
 
 void FFmpegDemuxer::SetLiveness(DemuxerStream::Liveness liveness) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   for (const auto& stream : streams_) {
     if (stream)
       stream->SetLiveness(liveness);
   }
 }
 
 }  // namespace media