Darkangeel_hd
/
lineage_android_kernel_samsung_jf
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_samsung_jf.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge "msm: vidc: Add support for DIVX 4/5/6" into msm-3.0

This commit is contained in:
Linux Build Service Account 2012-06-07 02:40:49 -07:00 committed by QuIC Gerrit Code Review
parent ff42609e6f a1980a18e0
commit 46b442cc55
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/video/msm_vidc/msm_vdec.c
View File

@ -224,6 +224,14 @@ static const struct msm_vidc_format vdec_formats[] = {
.num_planes = 1,
.get_frame_size = get_frame_size_compressed,
.type = OUTPUT_PORT,
},
{
.name = "DIVX",
.description = "DIVX 4/5/6 compressed format",
.fourcc = V4L2_PIX_FMT_DIVX,
.num_planes = 1,
.get_frame_size = get_frame_size_compressed,
.type = OUTPUT_PORT,
}
};

4
drivers/media/video/msm_vidc/msm_vidc_common.c
View File

@ -629,8 +629,10 @@ static enum hal_video_codec get_hal_codec_type(int fourcc)
case V4L2_PIX_FMT_DIVX_311:
codec = HAL_VIDEO_CODEC_DIVX_311;
break;
case V4L2_PIX_FMT_DIVX:
codec = HAL_VIDEO_CODEC_DIVX;
break;
/*HAL_VIDEO_CODEC_MVC
HAL_VIDEO_CODEC_DIVX
HAL_VIDEO_CODEC_SPARK
HAL_VIDEO_CODEC_VP6
HAL_VIDEO_CODEC_VP7

7
drivers/media/video/msm_vidc/vidc_hal_interrupt_handler.c
View File

@ -510,9 +510,12 @@ static void hal_process_session_ftb_done(struct hal_device *device,
if (sizeof(struct
hfi_msg_session_fill_buffer_done_compressed_packet)
!= pkt->size) {
HAL_MSG_ERROR("hal_process_session_ftb_done:"
"bad_pkt_size");
HAL_MSG_ERROR("%s: bad_pkt_size", __func__);
return;
} else if (pkt->error_type != HFI_ERR_NONE) {
HAL_MSG_ERROR("%s: got buffer back with error %x",
__func__, pkt->error_type);
/* Proceed with the FBD */
}
data_done.device_id = device->device_id;

3
include/linux/videodev2.h
View File

@ -386,7 +386,8 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_XVID v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid */
#define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */
#define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */
#define V4L2_PIX_FMT_DIVX_311 v4l2_fourcc('D', 'I', 'V', '3') /* DIVX */
#define V4L2_PIX_FMT_DIVX_311 v4l2_fourcc('D', 'I', 'V', '3') /* DIVX311 */
#define V4L2_PIX_FMT_DIVX v4l2_fourcc('D', 'I', 'V', 'X') /* DIVX */
/* Vendor-specific formats */
#define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */