Support more QCOM specific color formats for Android HW decoder.

webrtc/api/android/jni/androidmediacodeccommon.h

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 10 matching lines @@
 #include "webrtc/base/thread.h"
 
 namespace webrtc_jni {
 
 // Uncomment this define to enable verbose logging for every encoded/decoded
 // video frame.
 //#define TRACK_BUFFER_TIMING
 
 #define TAG_COMMON "MediaCodecVideo"
 
-// Color formats supported by encoder - should mirror supportedColorList
-// from MediaCodecVideoEncoder.java
+// Color formats supported by encoder or decoder - should mirror
+// supportedColorList from MediaCodecVideoEncoder.java and
+// MediaCodecVideoDecoder.java
 enum COLOR_FORMATTYPE {
   COLOR_FormatYUV420Planar = 0x13,
   COLOR_FormatYUV420SemiPlanar = 0x15,
   COLOR_QCOM_FormatYUV420SemiPlanar = 0x7FA30C00,
   // NV12 color format supported by QCOM codec, but not declared in MediaCodec -
   // see /hardware/qcom/media/mm-core/inc/OMX_QCOMExtns.h
   // This format is presumably similar to COLOR_FormatYUV420SemiPlanar,
   // but requires some (16, 32?) byte alignment.
+  COLOR_QCOM_FORMATYVU420PackedSemiPlanar32m4ka = 0x7FA30C01,

[magjed_webrtc, 2016/09/17 08:52:30]

Don't you need to add these formats to the switch statement in
androidmediaencoder_jni.cc?
https://cs.chromium.org/chromium/src/third_party/webrtc/api/android/jni/andro...

[AlexG, 2016/09/19 20:28:45]

I don't think so. For decoder we request some specific color format, but then
decoder is free to overwrite the format we requested using
MediaCodec.INFO_OUTPUT_FORMAT_CHANGED. And we need to support if decoder decides
to output some QCOM specific color space format.

The encoder is different in terms is that we specify to the encoder what format
we are going to send to, it can not treat it as different format and overwrite
with its alignemnt specific format. 

[magjed_webrtc, 2016/09/20 09:12:41]

Right. Is the plan to update the encoder in a follow-up CL? What I don't
understand is why you have updated this enum without updating supportedColorList
in MediaCodecVideoEncoder.java and the switch in androidmediaencoder_jni.cc.
With your change, this enum does not mirror the encoder, contradicting the
comment. The encoder is the only one actually using all values in this enum, the
decoder is just using COLOR_FormatYUV420Planar.

[AlexG, 2016/09/20 22:29:16]

No, I don't plan to update the encoder. Supported formats can be different for
encoder and decoder. We support the case if decoder outputs QCOM format which
uses some optimized alignment. But we do not support the case when we have to
provide data to encoder in this format since we do not know exact alignment
requirements.
I updated the comment to reflect this

[magjed_webrtc, 2016/09/22 09:13:10]

Ok, sgtm.

+  COLOR_QCOM_FORMATYVU420PackedSemiPlanar16m4ka = 0x7FA30C02,
+  COLOR_QCOM_FORMATYVU420PackedSemiPlanar64x32Tile2m8ka = 0x7FA30C03,
   COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m = 0x7FA30C04
 };
 
 // Arbitrary interval to poll the codec for new outputs.
 enum { kMediaCodecPollMs = 10 };
 // Arbitrary interval to poll at when there should be no more frames.
 enum { kMediaCodecPollNoFramesMs = 100 };
 // Media codec maximum output buffer ready timeout.
 enum { kMediaCodecTimeoutMs = 1000 };
 // Interval to print codec statistics (bitrate, fps, encoding/decoding time).
@@ skipping 32 matching lines @@
     jni->ExceptionDescribe();
     jni->ExceptionClear();
     return true;
   }
   return false;
 }
 
 }  // namespace webrtc_jni
 
 #endif  // WEBRTC_API_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_