generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226'

Browse Source 
* commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226':
  avformat/dv: K&R formatting cosmetics

Conflicts:
	libavformat/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-06 18:01:03 +02:00
commit 7565aaecb4
1 changed files with 95 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
libavformat/dv.c
View File

@ -126,7 +126,7 @@ static int dv_extract_audio(uint8_t* frame, uint8_t* ppcm[4],
return 0; return 0;
smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */ smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */
freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */ freq = as_pack[4] >> 3 & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */
quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */ quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */
if (quant > 1) if (quant > 1)
@ -169,12 +169,16 @@ static int dv_extract_audio(uint8_t* frame, uint8_t* ppcm[4],
for (j = 0; j < 9; j++) { for (j = 0; j < 9; j++) {
for (d = 8; d < 80; d += 2) { for (d = 8; d < 80; d += 2) {
if (quant == 0) { /* 16bit quantization */ if (quant == 0) { /* 16bit quantization */
of = sys->audio_shuffle[i][j] + (d - 8) / 2 * sys->audio_stride; of = sys->audio_shuffle[i][j] +
(d - 8) / 2 * sys->audio_stride;
if (of * 2 >= size) if (of * 2 >= size)
continue; continue;
pcm[of*2] = frame[d+1]; // FIXME: maybe we have to admit /* FIXME: maybe we have to admit that DV is a
pcm[of*2+1] = frame[d]; // that DV is a big-endian PCM * big-endian PCM */
pcm[of * 2] = frame[d + 1];
pcm[of * 2 + 1] = frame[d];
if (pcm[of * 2 + 1] == 0x80 && pcm[of * 2] == 0x00) if (pcm[of * 2 + 1] == 0x80 && pcm[of * 2] == 0x00)
pcm[of * 2 + 1] = 0; pcm[of * 2 + 1] = 0;
} else { /* 12bit quantization */ } else { /* 12bit quantization */
@ -185,16 +189,21 @@ static int dv_extract_audio(uint8_t* frame, uint8_t* ppcm[4],
lc = (lc == 0x800 ? 0 : dv_audio_12to16(lc)); lc = (lc == 0x800 ? 0 : dv_audio_12to16(lc));
rc = (rc == 0x800 ? 0 : dv_audio_12to16(rc)); rc = (rc == 0x800 ? 0 : dv_audio_12to16(rc));
of = sys->audio_shuffle[i%half_ch][j] + (d - 8) / 3 * sys->audio_stride; of = sys->audio_shuffle[i % half_ch][j] +
(d - 8) / 3 * sys->audio_stride;
if (of * 2 >= size) if (of * 2 >= size)
continue; continue;
pcm[of*2] = lc & 0xff; // FIXME: maybe we have to admit /* FIXME: maybe we have to admit that DV is a
pcm[of*2+1] = lc >> 8; // that DV is a big-endian PCM * big-endian PCM */
pcm[of * 2] = lc & 0xff;
pcm[of * 2 + 1] = lc >> 8;
of = sys->audio_shuffle[i % half_ch + half_ch][j] + of = sys->audio_shuffle[i % half_ch + half_ch][j] +
(d - 8) / 3 * sys->audio_stride; (d - 8) / 3 * sys->audio_stride;
pcm[of*2] = rc & 0xff; // FIXME: maybe we have to admit /* FIXME: maybe we have to admit that DV is a
pcm[of*2+1] = rc >> 8; // that DV is a big-endian PCM * big-endian PCM */
pcm[of * 2] = rc & 0xff;
pcm[of * 2 + 1] = rc >> 8;
++d; ++d;
} }
} }
@ -219,8 +228,8 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame)
} }
smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */ smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */
freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */ freq = as_pack[4] >> 3 & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */
stype = (as_pack[3] & 0x1f); /* 0 - 2CH, 2 - 4CH, 3 - 8CH */ stype = as_pack[3] & 0x1f; /* 0 - 2CH, 2 - 4CH, 3 - 8CH */
quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */ quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */
if (freq >= FF_ARRAY_ELEMS(dv_audio_frequency)) { if (freq >= FF_ARRAY_ELEMS(dv_audio_frequency)) {
@ -264,7 +273,7 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame)
} }
c->ach = i; c->ach = i;
return (c->sys->audio_min_samples[freq] + smpls) * 4; /* 2ch, 2bytes */; return (c->sys->audio_min_samples[freq] + smpls) * 4; /* 2ch, 2bytes */
} }
static int dv_extract_video_info(DVDemuxContext *c, uint8_t *frame) static int dv_extract_video_info(DVDemuxContext *c, uint8_t *frame)
@ -287,7 +296,8 @@ static int dv_extract_video_info(DVDemuxContext *c, uint8_t* frame)
is16_9 = (vsc_pack && ((vsc_pack[2] & 0x07) == 0x02 || is16_9 = (vsc_pack && ((vsc_pack[2] & 0x07) == 0x02 ||
(!apt && (vsc_pack[2] & 0x07) == 0x07))); (!apt && (vsc_pack[2] & 0x07) == 0x07)));
c->vst->sample_aspect_ratio = c->sys->sar[is16_9]; c->vst->sample_aspect_ratio = c->sys->sar[is16_9];
avctx->bit_rate = av_rescale_q(c->sys->frame_size, (AVRational){8,1}, avctx->bit_rate = av_rescale_q(c->sys->frame_size,
(AVRational) { 8, 1 },
c->sys->time_base); c->sys->time_base);
size = c->sys->frame_size; size = c->sys->frame_size;
} }
@ -310,9 +320,7 @@ static int dv_extract_timecode(DVDemuxContext* c, uint8_t* frame, char *tc)
return 1; return 1;
} }
/* /* The following 3 functions constitute our interface to the world */
* The following 3 functions constitute our interface to the world
*/
DVDemuxContext *avpriv_dv_init_demux(AVFormatContext *s) DVDemuxContext *avpriv_dv_init_demux(AVFormatContext *s)
{ {
@ -372,7 +380,8 @@ int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt,
for (i = 0; i < c->ach; i++) { for (i = 0; i < c->ach; i++) {
c->audio_pkt[i].pos = pos; c->audio_pkt[i].pos = pos;
c->audio_pkt[i].size = size; c->audio_pkt[i].size = size;
c->audio_pkt[i].pts = c->abytes * 30000 * 8 / c->ast[i]->codec->bit_rate; c->audio_pkt[i].pts = c->abytes * 30000 * 8 /
c->ast[i]->codec->bit_rate;
ppcm[i] = c->audio_buf[i]; ppcm[i] = c->audio_buf[i];
} }
if (c->ach) if (c->ach)
@ -417,8 +426,10 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c,
offset = sys->frame_size * timestamp; offset = sys->frame_size * timestamp;
if (size >= 0 && offset > max_offset) offset = max_offset; if (size >= 0 && offset > max_offset)
else if (offset < 0) offset = 0; offset = max_offset;
else if (offset < 0)
offset = 0;
return offset + s->data_offset; return offset + s->data_offset;
} }
@ -508,13 +519,17 @@ static int dv_read_header(AVFormatContext *s)
avio_seek(s->pb, -DV_PROFILE_BYTES, SEEK_CUR) < 0) avio_seek(s->pb, -DV_PROFILE_BYTES, SEEK_CUR) < 0)
return AVERROR(EIO); return AVERROR(EIO);
c->dv_demux->sys = avpriv_dv_frame_profile(c->dv_demux->sys, c->buf, DV_PROFILE_BYTES); c->dv_demux->sys = avpriv_dv_frame_profile(c->dv_demux->sys,
c->buf,
DV_PROFILE_BYTES);
if (!c->dv_demux->sys) { if (!c->dv_demux->sys) {
av_log(s, AV_LOG_ERROR, "Can't determine profile of DV input stream.\n"); av_log(s, AV_LOG_ERROR,
"Can't determine profile of DV input stream.\n");
return -1; return -1;
} }
s->bit_rate = av_rescale_q(c->dv_demux->sys->frame_size, (AVRational){8,1}, s->bit_rate = av_rescale_q(c->dv_demux->sys->frame_size,
(AVRational) { 8, 1 },
c->dv_demux->sys->time_base); c->dv_demux->sys->time_base);
if (s->pb->seekable) if (s->pb->seekable)
@ -523,7 +538,6 @@ static int dv_read_header(AVFormatContext *s)
return 0; return 0;
} }
static int dv_read_packet(AVFormatContext *s, AVPacket *pkt) static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
int size; int size;
@ -592,8 +606,11 @@ static int dv_probe(AVProbeData *p)
} }
if (matches && p->buf_size / matches < 1024 * 1024) { if (matches && p->buf_size / matches < 1024 * 1024) {
if (matches > 4 || (secondary_matches >= 10 && p->buf_size / secondary_matches < 24000)) if (matches > 4 ||
return AVPROBE_SCORE_MAX*3/4; // not max to avoid dv in mov to match (secondary_matches >= 10 &&
p->buf_size / secondary_matches < 24000))
// not max to avoid dv in mov to match
return AVPROBE_SCORE_MAX * 3 / 4;
return AVPROBE_SCORE_MAX / 4; return AVPROBE_SCORE_MAX / 4;
} }
return 0; return 0;