ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/h264_sei: add namespace prefix to frame packingarrangement enum values

Browse Source 
Missed in 6eb102a616.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-09-12 19:59:23 -03:00
parent 6eb102a616
commit 9669c05baf
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/h264_sei.c
View File

@ -469,37 +469,37 @@ const char *ff_h264_sei_stereo_mode(const H264SEIFramePacking *h)
{ {
if (h->frame_packing_arrangement_cancel_flag == 0) { if (h->frame_packing_arrangement_cancel_flag == 0) {
switch (h->frame_packing_arrangement_type) { switch (h->frame_packing_arrangement_type) {
case SEI_FPA_TYPE_CHECKERBOARD: case H264_SEI_FPA_TYPE_CHECKERBOARD:
if (h->content_interpretation_type == 2) if (h->content_interpretation_type == 2)
return "checkerboard_rl"; return "checkerboard_rl";
else else
return "checkerboard_lr"; return "checkerboard_lr";
case SEI_FPA_TYPE_INTERLEAVE_COLUMN: case H264_SEI_FPA_TYPE_INTERLEAVE_COLUMN:
if (h->content_interpretation_type == 2) if (h->content_interpretation_type == 2)
return "col_interleaved_rl"; return "col_interleaved_rl";
else else
return "col_interleaved_lr"; return "col_interleaved_lr";
case SEI_FPA_TYPE_INTERLEAVE_ROW: case H264_SEI_FPA_TYPE_INTERLEAVE_ROW:
if (h->content_interpretation_type == 2) if (h->content_interpretation_type == 2)
return "row_interleaved_rl"; return "row_interleaved_rl";
else else
return "row_interleaved_lr"; return "row_interleaved_lr";
case SEI_FPA_TYPE_SIDE_BY_SIDE: case H264_SEI_FPA_TYPE_SIDE_BY_SIDE:
if (h->content_interpretation_type == 2) if (h->content_interpretation_type == 2)
return "right_left"; return "right_left";
else else
return "left_right"; return "left_right";
case SEI_FPA_TYPE_TOP_BOTTOM: case H264_SEI_FPA_TYPE_TOP_BOTTOM:
if (h->content_interpretation_type == 2) if (h->content_interpretation_type == 2)
return "bottom_top"; return "bottom_top";
else else
return "top_bottom"; return "top_bottom";
case SEI_FPA_TYPE_INTERLEAVE_TEMPORAL: case H264_SEI_FPA_TYPE_INTERLEAVE_TEMPORAL:
if (h->content_interpretation_type == 2) if (h->content_interpretation_type == 2)
return "block_rl"; return "block_rl";
else else
return "block_lr"; return "block_lr";
case SEI_FPA_TYPE_2D: case H264_SEI_FPA_TYPE_2D:
default: default:
return "mono"; return "mono";
} }

18
libavcodec/h264_sei.h
View File

@ -56,14 +56,14 @@ typedef enum {
* frame_packing_arrangement types * frame_packing_arrangement types
*/ */
typedef enum { typedef enum {
SEI_FPA_TYPE_CHECKERBOARD = 0, H264_SEI_FPA_TYPE_CHECKERBOARD = 0,
SEI_FPA_TYPE_INTERLEAVE_COLUMN = 1, H264_SEI_FPA_TYPE_INTERLEAVE_COLUMN = 1,
SEI_FPA_TYPE_INTERLEAVE_ROW = 2, H264_SEI_FPA_TYPE_INTERLEAVE_ROW = 2,
SEI_FPA_TYPE_SIDE_BY_SIDE = 3, H264_SEI_FPA_TYPE_SIDE_BY_SIDE = 3,
SEI_FPA_TYPE_TOP_BOTTOM = 4, H264_SEI_FPA_TYPE_TOP_BOTTOM = 4,
SEI_FPA_TYPE_INTERLEAVE_TEMPORAL = 5, H264_SEI_FPA_TYPE_INTERLEAVE_TEMPORAL = 5,
SEI_FPA_TYPE_2D = 6, H264_SEI_FPA_TYPE_2D = 6,
} SEI_FpaType; } H264_SEI_FpaType;
typedef struct H264SEIPictureTiming { typedef struct H264SEIPictureTiming {
int present; int present;
@ -121,7 +121,7 @@ typedef struct H264SEIFramePacking {
int present; int present;
int frame_packing_arrangement_id; int frame_packing_arrangement_id;
int frame_packing_arrangement_cancel_flag; ///< is previous arrangement canceled, -1 if never received int frame_packing_arrangement_cancel_flag; ///< is previous arrangement canceled, -1 if never received
SEI_FpaType frame_packing_arrangement_type; H264_SEI_FpaType frame_packing_arrangement_type;
int frame_packing_arrangement_repetition_period; int frame_packing_arrangement_repetition_period;
int content_interpretation_type; int content_interpretation_type;
int quincunx_sampling_flag; int quincunx_sampling_flag;