Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

dirac: K&R formatting cosmetics

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
pull/88/head
Gabriel Dume 11 years ago committed by Diego Biurrun
parent 1ec335513f
commit 9752d07d33
2 changed files with 83 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      libavcodec/dirac.c
  2. 38
      libavcodec/dirac_parser.c

42
libavcodec/dirac.c
Unescape View File

@ -26,8 +26,9 @@
*/ */
#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"
@ -61,20 +62,20 @@ static const dirac_source_params dirac_source_parameters_defaults[] = {
/* [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;
@ -169,10 +170,10 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
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) */
@ -192,7 +193,7 @@ 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 */
@ -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;
} }

38
libavcodec/dirac_parser.c
Unescape 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,11 +76,11 @@ 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
@ -90,8 +91,7 @@ static int find_frame_end(DiracParseContext *pc,
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;
@ -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;
@ -163,7 +163,7 @@ static int dirac_combine_frame(AVCodecParserContext *s, AVCodecContext *avctx,
!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,7 +177,7 @@ 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;
@ -191,7 +191,7 @@ static int dirac_combine_frame(AVCodecParserContext *s, AVCodecContext *avctx,
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;
@ -204,7 +204,7 @@ static int dirac_combine_frame(AVCodecParserContext *s, AVCodecContext *avctx,
*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;
@ -227,15 +227,13 @@ static int dirac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
/* 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;

Write Preview
Loading…
Cancel
Save