xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dirac: K&R formatting cosmetics

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Gabriel Dume 2014-09-08 18:32:34 -04:00 committed by Diego Biurrun
parent 1ec335513f
commit 9752d07d33
2 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
libavcodec/dirac.c
View File

@ -26,55 +26,56 @@
*/ */
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "dirac.h"
#include "avcodec.h" #include "avcodec.h"
#include "dirac.h"
#include "golomb.h" #include "golomb.h"
#include "internal.h" #include "internal.h"
#include "mpeg12data.h" #include "mpeg12data.h"
// defaults for source parameters // defaults for source parameters
static const dirac_source_params dirac_source_parameters_defaults[] = { static const dirac_source_params dirac_source_parameters_defaults[] = {
{ 640, 480, 2, 0, 0, 1, 1, 640, 480, 0, 0, 1, 0 }, { 640, 480, 2, 0, 0, 1, 1, 640, 480, 0, 0, 1, 0 },
{ 176, 120, 2, 0, 0, 9, 2, 176, 120, 0, 0, 1, 1 }, { 176, 120, 2, 0, 0, 9, 2, 176, 120, 0, 0, 1, 1 },
{ 176, 144, 2, 0, 1, 10, 3, 176, 144, 0, 0, 1, 2 }, { 176, 144, 2, 0, 1, 10, 3, 176, 144, 0, 0, 1, 2 },
{ 352, 240, 2, 0, 0, 9, 2, 352, 240, 0, 0, 1, 1 }, { 352, 240, 2, 0, 0, 9, 2, 352, 240, 0, 0, 1, 1 },
{ 352, 288, 2, 0, 1, 10, 3, 352, 288, 0, 0, 1, 2 }, { 352, 288, 2, 0, 1, 10, 3, 352, 288, 0, 0, 1, 2 },
{ 704, 480, 2, 0, 0, 9, 2, 704, 480, 0, 0, 1, 1 }, { 704, 480, 2, 0, 0, 9, 2, 704, 480, 0, 0, 1, 1 },
{ 704, 576, 2, 0, 1, 10, 3, 704, 576, 0, 0, 1, 2 }, { 704, 576, 2, 0, 1, 10, 3, 704, 576, 0, 0, 1, 2 },
{ 720, 480, 1, 1, 0, 4, 2, 704, 480, 8, 0, 3, 1 }, { 720, 480, 1, 1, 0, 4, 2, 704, 480, 8, 0, 3, 1 },
{ 720, 576, 1, 1, 1, 3, 3, 704, 576, 8, 0, 3, 2 }, { 720, 576, 1, 1, 1, 3, 3, 704, 576, 8, 0, 3, 2 },
{ 1280, 720, 1, 0, 1, 7, 1, 1280, 720, 0, 0, 3, 3 }, { 1280, 720, 1, 0, 1, 7, 1, 1280, 720, 0, 0, 3, 3 },
{ 1280, 720, 1, 0, 1, 6, 1, 1280, 720, 0, 0, 3, 3 }, { 1280, 720, 1, 0, 1, 6, 1, 1280, 720, 0, 0, 3, 3 },
{ 1920, 1080, 1, 1, 1, 4, 1, 1920, 1080, 0, 0, 3, 3 }, { 1920, 1080, 1, 1, 1, 4, 1, 1920, 1080, 0, 0, 3, 3 },
{ 1920, 1080, 1, 1, 1, 3, 1, 1920, 1080, 0, 0, 3, 3 }, { 1920, 1080, 1, 1, 1, 3, 1, 1920, 1080, 0, 0, 3, 3 },
{ 1920, 1080, 1, 0, 1, 7, 1, 1920, 1080, 0, 0, 3, 3 }, { 1920, 1080, 1, 0, 1, 7, 1, 1920, 1080, 0, 0, 3, 3 },
{ 1920, 1080, 1, 0, 1, 6, 1, 1920, 1080, 0, 0, 3, 3 }, { 1920, 1080, 1, 0, 1, 6, 1, 1920, 1080, 0, 0, 3, 3 },
{ 2048, 1080, 0, 0, 1, 2, 1, 2048, 1080, 0, 0, 4, 4 }, { 2048, 1080, 0, 0, 1, 2, 1, 2048, 1080, 0, 0, 4, 4 },
{ 4096, 2160, 0, 0, 1, 2, 1, 4096, 2160, 0, 0, 4, 4 }, { 4096, 2160, 0, 0, 1, 2, 1, 4096, 2160, 0, 0, 4, 4 },
{ 3840, 2160, 1, 0, 1, 7, 1, 3840, 2160, 0, 0, 3, 3 }, { 3840, 2160, 1, 0, 1, 7, 1, 3840, 2160, 0, 0, 3, 3 },
{ 3840, 2160, 1, 0, 1, 6, 1, 3840, 2160, 0, 0, 3, 3 }, { 3840, 2160, 1, 0, 1, 6, 1, 3840, 2160, 0, 0, 3, 3 },
{ 7680, 4320, 1, 0, 1, 7, 1, 3840, 2160, 0, 0, 3, 3 }, { 7680, 4320, 1, 0, 1, 7, 1, 3840, 2160, 0, 0, 3, 3 },
{ 7680, 4320, 1, 0, 1, 6, 1, 3840, 2160, 0, 0, 3, 3 }, { 7680, 4320, 1, 0, 1, 6, 1, 3840, 2160, 0, 0, 3, 3 },
}; };
/* [DIRAC_STD] Table 10.4 - Available preset pixel aspect ratio values */ /* [DIRAC_STD] Table 10.4 - Available preset pixel aspect ratio values */
static const AVRational dirac_preset_aspect_ratios[] = { static const AVRational dirac_preset_aspect_ratios[] = {
{1, 1}, { 1, 1 },
{10, 11}, { 10, 11 },
{12, 11}, { 12, 11 },
{40, 33}, { 40, 33 },
{16, 11}, { 16, 11 },
{4, 3}, { 4, 3 },
}; };
/* [DIRAC_STD] Values 9,10 of 10.3.5 Frame Rate. /* [DIRAC_STD] Values 9,10 of 10.3.5 Frame Rate.
* Table 10.3 Available preset frame rate values * Table 10.3 Available preset frame rate values
*/ */
static const AVRational dirac_frame_rate[] = { static const AVRational dirac_frame_rate[] = {
{15000, 1001}, { 15000, 1001 },
{25, 2}, { 25, 2 },
}; };
/* [DIRAC_STD] This should be equivalent to Table 10.5 Available signal /* [DIRAC_STD] This should be equivalent to Table 10.5 Available signal
@ -83,10 +84,10 @@ static const struct {
uint8_t bitdepth; uint8_t bitdepth;
enum AVColorRange color_range; enum AVColorRange color_range;
} pixel_range_presets[] = { } pixel_range_presets[] = {
{8, AVCOL_RANGE_JPEG}, { 8, AVCOL_RANGE_JPEG },
{8, AVCOL_RANGE_MPEG}, { 8, AVCOL_RANGE_MPEG },
{10, AVCOL_RANGE_MPEG}, { 10, AVCOL_RANGE_MPEG },
{12, AVCOL_RANGE_MPEG}, { 12, AVCOL_RANGE_MPEG },
}; };
static const enum AVColorPrimaries dirac_primaries[] = { static const enum AVColorPrimaries dirac_primaries[] = {
@ -118,7 +119,7 @@ static const enum AVPixelFormat dirac_pix_fmt[2][3] = {
static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb, static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
dirac_source_params *source) dirac_source_params *source)
{ {
AVRational frame_rate = {0,0}; AVRational frame_rate = { 0, 0 };
unsigned luma_depth = 8, luma_offset = 16; unsigned luma_depth = 8, luma_offset = 16;
int idx; int idx;
@ -168,16 +169,16 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
if (source->frame_rate_index <= 8) if (source->frame_rate_index <= 8)
frame_rate = ff_mpeg12_frame_rate_tab[source->frame_rate_index]; frame_rate = ff_mpeg12_frame_rate_tab[source->frame_rate_index];
else else
/* [DIRAC_STD] Table 10.3 values 9-10 */ /* [DIRAC_STD] Table 10.3 values 9-10 */
frame_rate = dirac_frame_rate[source->frame_rate_index-9]; frame_rate = dirac_frame_rate[source->frame_rate_index - 9];
} }
av_reduce(&avctx->time_base.num, &avctx->time_base.den, av_reduce(&avctx->time_base.num, &avctx->time_base.den,
frame_rate.den, frame_rate.num, 1<<30); frame_rate.den, frame_rate.num, 1 << 30);
/* [DIRAC_STD] 10.3.6 Pixel Aspect Ratio. /* [DIRAC_STD] 10.3.6 Pixel Aspect Ratio.
* pixel_aspect_ratio(video_params) */ * pixel_aspect_ratio(video_params) */
if (get_bits1(gb)) { /* [DIRAC_STD] custom_pixel_aspect_ratio_flag */ if (get_bits1(gb)) { /* [DIRAC_STD] custom_pixel_aspect_ratio_flag */
/* [DIRAC_STD] index */ /* [DIRAC_STD] index */
source->aspect_ratio_index = svq3_get_ue_golomb(gb); source->aspect_ratio_index = svq3_get_ue_golomb(gb);
if (source->aspect_ratio_index > 6) if (source->aspect_ratio_index > 6)
@ -192,16 +193,16 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
* aspect ratio values */ * aspect ratio values */
if (source->aspect_ratio_index > 0) if (source->aspect_ratio_index > 0)
avctx->sample_aspect_ratio = avctx->sample_aspect_ratio =
dirac_preset_aspect_ratios[source->aspect_ratio_index-1]; dirac_preset_aspect_ratios[source->aspect_ratio_index - 1];
/* [DIRAC_STD] 10.3.7 Clean area. clean_area(video_params) */ /* [DIRAC_STD] 10.3.7 Clean area. clean_area(video_params) */
if (get_bits1(gb)) { /* [DIRAC_STD] custom_clean_area_flag */ if (get_bits1(gb)) { /* [DIRAC_STD] custom_clean_area_flag */
/* [DIRAC_STD] CLEAN_WIDTH */ /* [DIRAC_STD] CLEAN_WIDTH */
source->clean_width = svq3_get_ue_golomb(gb); source->clean_width = svq3_get_ue_golomb(gb);
/* [DIRAC_STD] CLEAN_HEIGHT */ /* [DIRAC_STD] CLEAN_HEIGHT */
source->clean_height = svq3_get_ue_golomb(gb); source->clean_height = svq3_get_ue_golomb(gb);
/* [DIRAC_STD] CLEAN_LEFT_OFFSET */ /* [DIRAC_STD] CLEAN_LEFT_OFFSET */
source->clean_left_offset = svq3_get_ue_golomb(gb); source->clean_left_offset = svq3_get_ue_golomb(gb);
/* [DIRAC_STD] CLEAN_RIGHT_OFFSET */ /* [DIRAC_STD] CLEAN_RIGHT_OFFSET */
source->clean_right_offset = svq3_get_ue_golomb(gb); source->clean_right_offset = svq3_get_ue_golomb(gb);
} }
@ -219,16 +220,17 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
// This assumes either fullrange or MPEG levels only // This assumes either fullrange or MPEG levels only
if (!source->pixel_range_index) { if (!source->pixel_range_index) {
luma_offset = svq3_get_ue_golomb(gb); luma_offset = svq3_get_ue_golomb(gb);
luma_depth = av_log2(svq3_get_ue_golomb(gb))+1; luma_depth = av_log2(svq3_get_ue_golomb(gb)) + 1;
svq3_get_ue_golomb(gb); /* chroma offset */ svq3_get_ue_golomb(gb); /* chroma offset */
svq3_get_ue_golomb(gb); /* chroma excursion */ svq3_get_ue_golomb(gb); /* chroma excursion */
avctx->color_range = luma_offset ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; avctx->color_range = luma_offset ? AVCOL_RANGE_MPEG
: AVCOL_RANGE_JPEG;
} }
} }
/* [DIRAC_STD] Table 10.5 /* [DIRAC_STD] Table 10.5
* Available signal range presets <--> pixel_range_presets */ * Available signal range presets <--> pixel_range_presets */
if (source->pixel_range_index > 0) { if (source->pixel_range_index > 0) {
idx = source->pixel_range_index-1; idx = source->pixel_range_index - 1;
luma_depth = pixel_range_presets[idx].bitdepth; luma_depth = pixel_range_presets[idx].bitdepth;
avctx->color_range = pixel_range_presets[idx].color_range; avctx->color_range = pixel_range_presets[idx].color_range;
} }
@ -240,7 +242,7 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
/* [DIRAC_STD] 10.3.9 Colour specification. colour_spec(video_params) */ /* [DIRAC_STD] 10.3.9 Colour specification. colour_spec(video_params) */
if (get_bits1(gb)) { /* [DIRAC_STD] custom_colour_spec_flag */ if (get_bits1(gb)) { /* [DIRAC_STD] custom_colour_spec_flag */
/* [DIRAC_STD] index */ /* [DIRAC_STD] index */
idx = source->color_spec_index = svq3_get_ue_golomb(gb); idx = source->color_spec_index = svq3_get_ue_golomb(gb);
if (source->color_spec_index > 4) if (source->color_spec_index > 4)
@ -270,7 +272,7 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
avctx->color_trc = AVCOL_TRC_BT709; avctx->color_trc = AVCOL_TRC_BT709;
} }
} else { } else {
idx = source->color_spec_index; idx = source->color_spec_index;
avctx->color_primaries = dirac_color_presets[idx].color_primaries; avctx->color_primaries = dirac_color_presets[idx].color_primaries;
avctx->colorspace = dirac_color_presets[idx].colorspace; avctx->colorspace = dirac_color_presets[idx].colorspace;
avctx->color_trc = dirac_color_presets[idx].color_trc; avctx->color_trc = dirac_color_presets[idx].color_trc;
@ -281,7 +283,7 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
/* [DIRAC_STD] 10. Sequence Header. sequence_header() */ /* [DIRAC_STD] 10. Sequence Header. sequence_header() */
int avpriv_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb, int avpriv_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb,
dirac_source_params *source) dirac_source_params *source)
{ {
unsigned version_major; unsigned version_major;
unsigned video_format, picture_coding_mode; unsigned video_format, picture_coding_mode;

58
libavcodec/dirac_parser.c
View File

@ -31,6 +31,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "parser.h" #include "parser.h"
#define DIRAC_PARSE_INFO_PREFIX 0x42424344 #define DIRAC_PARSE_INFO_PREFIX 0x42424344
@ -75,23 +76,22 @@ static int find_frame_end(DiracParseContext *pc,
pc->sync_offset = 0; pc->sync_offset = 0;
for (; i < buf_size; i++) { for (; i < buf_size; i++) {
if (state == DIRAC_PARSE_INFO_PREFIX) { if (state == DIRAC_PARSE_INFO_PREFIX) {
if ((buf_size-i) >= pc->header_bytes_needed) { if ((buf_size - i) >= pc->header_bytes_needed) {
pc->state = -1; pc->state = -1;
return i + pc->header_bytes_needed; return i + pc->header_bytes_needed;
} else { } else {
pc->header_bytes_needed = 9-(buf_size-i); pc->header_bytes_needed = 9 - (buf_size - i);
break; break;
} }
} else } else
state = (state << 8) | buf[i]; state = (state << 8) | buf[i];
} }
} }
pc->state = state; pc->state = state;
return -1; return -1;
} }
typedef struct DiracParseUnit typedef struct DiracParseUnit {
{
int next_pu_offset; int next_pu_offset;
int prev_pu_offset; int prev_pu_offset;
uint8_t pu_type; uint8_t pu_type;
@ -102,12 +102,12 @@ static int unpack_parse_unit(DiracParseUnit *pu, DiracParseContext *pc,
{ {
uint8_t *start = pc->buffer + offset; uint8_t *start = pc->buffer + offset;
uint8_t *end = pc->buffer + pc->index; uint8_t *end = pc->buffer + pc->index;
if (start < pc->buffer || (start+13 > end)) if (start < pc->buffer || (start + 13 > end))
return 0; return 0;
pu->pu_type = start[4]; pu->pu_type = start[4];
pu->next_pu_offset = AV_RB32(start+5); pu->next_pu_offset = AV_RB32(start + 5);
pu->prev_pu_offset = AV_RB32(start+9); pu->prev_pu_offset = AV_RB32(start + 9);
if (pu->pu_type == 0x10 && pu->next_pu_offset == 0) if (pu->pu_type == 0x10 && pu->next_pu_offset == 0)
pu->next_pu_offset = 13; pu->next_pu_offset = 13;
@ -125,7 +125,7 @@ static int dirac_combine_frame(AVCodecParserContext *s, AVCodecContext *avctx,
if (pc->overread_index) { if (pc->overread_index) {
memcpy(pc->buffer, pc->buffer + pc->overread_index, memcpy(pc->buffer, pc->buffer + pc->overread_index,
pc->index - pc->overread_index); pc->index - pc->overread_index);
pc->index -= pc->overread_index; pc->index -= pc->overread_index;
pc->overread_index = 0; pc->overread_index = 0;
if (*buf_size == 0 && pc->buffer[4] == 0x10) { if (*buf_size == 0 && pc->buffer[4] == 0x10) {
*buf = pc->buffer; *buf = pc->buffer;
@ -134,13 +134,13 @@ static int dirac_combine_frame(AVCodecParserContext *s, AVCodecContext *avctx,
} }
} }
if ( next == -1) { if (next == -1) {
/* Found a possible frame start but not a frame end */ /* Found a possible frame start but not a frame end */
void *new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, void *new_buffer =
pc->index + (*buf_size - av_fast_realloc(pc->buffer, &pc->buffer_size,
pc->sync_offset)); pc->index + (*buf_size - pc->sync_offset));
pc->buffer = new_buffer; pc->buffer = new_buffer;
memcpy(pc->buffer+pc->index, (*buf + pc->sync_offset), memcpy(pc->buffer + pc->index, (*buf + pc->sync_offset),
*buf_size - pc->sync_offset); *buf_size - pc->sync_offset);
pc->index += *buf_size - pc->sync_offset; pc->index += *buf_size - pc->sync_offset;
return -1; return -1;
@ -162,8 +162,8 @@ static int dirac_combine_frame(AVCodecParserContext *s, AVCodecContext *avctx,
if (!unpack_parse_unit(&pu1, pc, pc->index - 13) || if (!unpack_parse_unit(&pu1, pc, pc->index - 13) ||
!unpack_parse_unit(&pu, pc, pc->index - 13 - pu1.prev_pu_offset) || !unpack_parse_unit(&pu, pc, pc->index - 13 - pu1.prev_pu_offset) ||
pu.next_pu_offset != pu1.prev_pu_offset) { pu.next_pu_offset != pu1.prev_pu_offset) {
pc->index -= 9; pc->index -= 9;
*buf_size = next-9; *buf_size = next - 9;
pc->header_bytes_needed = 9; pc->header_bytes_needed = 9;
return -1; return -1;
} }
@ -177,9 +177,9 @@ static int dirac_combine_frame(AVCodecParserContext *s, AVCodecContext *avctx,
pc->dirac_unit_size += pu.next_pu_offset; pc->dirac_unit_size += pu.next_pu_offset;
if ((pu.pu_type&0x08) != 0x08) { if ((pu.pu_type & 0x08) != 0x08) {
pc->header_bytes_needed = 9; pc->header_bytes_needed = 9;
*buf_size = next; *buf_size = next;
return -1; return -1;
} }
@ -187,24 +187,24 @@ static int dirac_combine_frame(AVCodecParserContext *s, AVCodecContext *avctx,
if (parse_timing_info) { if (parse_timing_info) {
uint8_t *cur_pu = pc->buffer + uint8_t *cur_pu = pc->buffer +
pc->index - 13 - pu1.prev_pu_offset; pc->index - 13 - pu1.prev_pu_offset;
int pts = AV_RB32(cur_pu + 13); int pts = AV_RB32(cur_pu + 13);
if (s->last_pts == 0 && s->last_dts == 0) if (s->last_pts == 0 && s->last_dts == 0)
s->dts = pts - 1; s->dts = pts - 1;
else else
s->dts = s->last_dts+1; s->dts = s->last_dts + 1;
s->pts = pts; s->pts = pts;
if (!avctx->has_b_frames && (cur_pu[4] & 0x03)) if (!avctx->has_b_frames && (cur_pu[4] & 0x03))
avctx->has_b_frames = 1; avctx->has_b_frames = 1;
} }
if (avctx->has_b_frames && s->pts == s->dts) if (avctx->has_b_frames && s->pts == s->dts)
s->pict_type = AV_PICTURE_TYPE_B; s->pict_type = AV_PICTURE_TYPE_B;
/* Finally have a complete Dirac data unit */ /* Finally have a complete Dirac data unit */
*buf = pc->dirac_unit; *buf = pc->dirac_unit;
*buf_size = pc->dirac_unit_size; *buf_size = pc->dirac_unit_size;
pc->dirac_unit_size = 0; pc->dirac_unit_size = 0;
pc->overread_index = pc->index-13; pc->overread_index = pc->index - 13;
pc->header_bytes_needed = 9; pc->header_bytes_needed = 9;
} }
return next; return next;
@ -217,27 +217,25 @@ static int dirac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
DiracParseContext *pc = s->priv_data; DiracParseContext *pc = s->priv_data;
int next; int next;
*poutbuf = NULL; *poutbuf = NULL;
*poutbuf_size = 0; *poutbuf_size = 0;
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
next = buf_size; next = buf_size;
*poutbuf = buf; *poutbuf = buf;
*poutbuf_size = buf_size; *poutbuf_size = buf_size;
/* Assume that data has been packetized into an encapsulation unit. */ /* Assume that data has been packetized into an encapsulation unit. */
} else { } else {
next = find_frame_end(pc, buf, buf_size); next = find_frame_end(pc, buf, buf_size);
if (!pc->is_synced && next == -1) { if (!pc->is_synced && next == -1)
/* No frame start found yet. So throw away the entire buffer. */ /* No frame start found yet. So throw away the entire buffer. */
return buf_size; return buf_size;
}
if (dirac_combine_frame(s, avctx, next, &buf, &buf_size) < 0) { if (dirac_combine_frame(s, avctx, next, &buf, &buf_size) < 0)
return buf_size; return buf_size;
}
} }
*poutbuf = buf; *poutbuf = buf;
*poutbuf_size = buf_size; *poutbuf_size = buf_size;
return next; return next;
} }