Skip to content

Commit

Permalink
libstagefright: add missing TI color format case
Browse files Browse the repository at this point in the history
Conflicts:
	media/libstagefright/ACodec.cpp
  • Loading branch information
Ziyann authored and andi34 committed Sep 17, 2016
1 parent 83776ea commit 73c069a
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions media/libstagefright/ACodec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4524,6 +4524,7 @@ bool ACodec::describeDefaultColorFormat(DescribeColorFormat2Params &params) {
fmt != OMX_COLOR_FormatYUV420PackedPlanar &&
fmt != OMX_COLOR_FormatYUV420SemiPlanar &&
fmt != OMX_COLOR_FormatYUV420PackedSemiPlanar &&
fmt != OMX_TI_COLOR_FormatYUV420PackedSemiPlanar &&
fmt != (OMX_COLOR_FORMATTYPE)HAL_PIXEL_FORMAT_YV12) {
ALOGW("do not know color format 0x%x = %d", fmt, fmt);
return false;
Expand Down Expand Up @@ -4600,6 +4601,7 @@ bool ACodec::describeDefaultColorFormat(DescribeColorFormat2Params &params) {
case OMX_COLOR_FormatYUV420SemiPlanar:
// FIXME: NV21 for sw-encoder, NV12 for decoder and hw-encoder
case OMX_COLOR_FormatYUV420PackedSemiPlanar:
case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar:
// NV12
image.mPlane[image.U].mOffset = params.nStride * params.nSliceHeight;
image.mPlane[image.U].mColInc = 2;
Expand Down

0 comments on commit 73c069a

Please sign in to comment.