Browse code
avcodec/h264_sei: add namespace prefix to frame packingarrangement enum values
Missed in 6eb102a616364d06a4cc994339b72910b3547e5f.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer authored on 2017/09/13 07:59:23Showing 2 changed files
| ... | ... |
@@ -469,37 +469,37 @@ const char *ff_h264_sei_stereo_mode(const H264SEIFramePacking *h) |
| 469 | 469 |
{
|
| 470 | 470 |
if (h->frame_packing_arrangement_cancel_flag == 0) {
|
| 471 | 471 |
switch (h->frame_packing_arrangement_type) {
|
| 472 |
- case SEI_FPA_TYPE_CHECKERBOARD: |
|
| 472 |
+ case H264_SEI_FPA_TYPE_CHECKERBOARD: |
|
| 473 | 473 |
if (h->content_interpretation_type == 2) |
| 474 | 474 |
return "checkerboard_rl"; |
| 475 | 475 |
else |
| 476 | 476 |
return "checkerboard_lr"; |
| 477 |
- case SEI_FPA_TYPE_INTERLEAVE_COLUMN: |
|
| 477 |
+ case H264_SEI_FPA_TYPE_INTERLEAVE_COLUMN: |
|
| 478 | 478 |
if (h->content_interpretation_type == 2) |
| 479 | 479 |
return "col_interleaved_rl"; |
| 480 | 480 |
else |
| 481 | 481 |
return "col_interleaved_lr"; |
| 482 |
- case SEI_FPA_TYPE_INTERLEAVE_ROW: |
|
| 482 |
+ case H264_SEI_FPA_TYPE_INTERLEAVE_ROW: |
|
| 483 | 483 |
if (h->content_interpretation_type == 2) |
| 484 | 484 |
return "row_interleaved_rl"; |
| 485 | 485 |
else |
| 486 | 486 |
return "row_interleaved_lr"; |
| 487 |
- case SEI_FPA_TYPE_SIDE_BY_SIDE: |
|
| 487 |
+ case H264_SEI_FPA_TYPE_SIDE_BY_SIDE: |
|
| 488 | 488 |
if (h->content_interpretation_type == 2) |
| 489 | 489 |
return "right_left"; |
| 490 | 490 |
else |
| 491 | 491 |
return "left_right"; |
| 492 |
- case SEI_FPA_TYPE_TOP_BOTTOM: |
|
| 492 |
+ case H264_SEI_FPA_TYPE_TOP_BOTTOM: |
|
| 493 | 493 |
if (h->content_interpretation_type == 2) |
| 494 | 494 |
return "bottom_top"; |
| 495 | 495 |
else |
| 496 | 496 |
return "top_bottom"; |
| 497 |
- case SEI_FPA_TYPE_INTERLEAVE_TEMPORAL: |
|
| 497 |
+ case H264_SEI_FPA_TYPE_INTERLEAVE_TEMPORAL: |
|
| 498 | 498 |
if (h->content_interpretation_type == 2) |
| 499 | 499 |
return "block_rl"; |
| 500 | 500 |
else |
| 501 | 501 |
return "block_lr"; |
| 502 |
- case SEI_FPA_TYPE_2D: |
|
| 502 |
+ case H264_SEI_FPA_TYPE_2D: |
|
| 503 | 503 |
default: |
| 504 | 504 |
return "mono"; |
| 505 | 505 |
} |
| ... | ... |
@@ -56,14 +56,14 @@ typedef enum {
|
| 56 | 56 |
* frame_packing_arrangement types |
| 57 | 57 |
*/ |
| 58 | 58 |
typedef enum {
|
| 59 |
- SEI_FPA_TYPE_CHECKERBOARD = 0, |
|
| 60 |
- SEI_FPA_TYPE_INTERLEAVE_COLUMN = 1, |
|
| 61 |
- SEI_FPA_TYPE_INTERLEAVE_ROW = 2, |
|
| 62 |
- SEI_FPA_TYPE_SIDE_BY_SIDE = 3, |
|
| 63 |
- SEI_FPA_TYPE_TOP_BOTTOM = 4, |
|
| 64 |
- SEI_FPA_TYPE_INTERLEAVE_TEMPORAL = 5, |
|
| 65 |
- SEI_FPA_TYPE_2D = 6, |
|
| 66 |
-} SEI_FpaType; |
|
| 59 |
+ H264_SEI_FPA_TYPE_CHECKERBOARD = 0, |
|
| 60 |
+ H264_SEI_FPA_TYPE_INTERLEAVE_COLUMN = 1, |
|
| 61 |
+ H264_SEI_FPA_TYPE_INTERLEAVE_ROW = 2, |
|
| 62 |
+ H264_SEI_FPA_TYPE_SIDE_BY_SIDE = 3, |
|
| 63 |
+ H264_SEI_FPA_TYPE_TOP_BOTTOM = 4, |
|
| 64 |
+ H264_SEI_FPA_TYPE_INTERLEAVE_TEMPORAL = 5, |
|
| 65 |
+ H264_SEI_FPA_TYPE_2D = 6, |
|
| 66 |
+} H264_SEI_FpaType; |
|
| 67 | 67 |
|
| 68 | 68 |
typedef struct H264SEIPictureTiming {
|
| 69 | 69 |
int present; |
| ... | ... |
@@ -121,7 +121,7 @@ typedef struct H264SEIFramePacking {
|
| 121 | 121 |
int present; |
| 122 | 122 |
int frame_packing_arrangement_id; |
| 123 | 123 |
int frame_packing_arrangement_cancel_flag; ///< is previous arrangement canceled, -1 if never received |
| 124 |
- SEI_FpaType frame_packing_arrangement_type; |
|
| 124 |
+ H264_SEI_FpaType frame_packing_arrangement_type; |
|
| 125 | 125 |
int frame_packing_arrangement_repetition_period; |
| 126 | 126 |
int content_interpretation_type; |
| 127 | 127 |
int quincunx_sampling_flag; |