Mercurial > libavformat.hg
changeset 4008:8af7a177b17d libavformat
prettyprinting cosmetics
| author | diego |
|---|---|
| date | Fri, 24 Oct 2008 21:41:27 +0000 |
| parents | d5eb96f97305 |
| children | f492dad79579 |
| files | dv.c dvenc.c |
| diffstat | 2 files changed, 81 insertions(+), 80 deletions(-) [+] |
line wrap: on
line diff
--- a/dv.c Fri Oct 24 21:37:06 2008 +0000 +++ b/dv.c Fri Oct 24 21:41:27 2008 +0000 @@ -35,14 +35,14 @@ struct DVDemuxContext { const DVprofile* sys; /* Current DV profile. E.g.: 525/60, 625/50 */ - AVFormatContext* fctx; - AVStream* vst; - AVStream* ast[4]; - AVPacket audio_pkt[4]; - uint8_t audio_buf[4][8192]; - int ach; - int frames; - uint64_t abytes; + AVFormatContext* fctx; + AVStream* vst; + AVStream* ast[4]; + AVPacket audio_pkt[4]; + uint8_t audio_buf[4][8192]; + int ach; + int frames; + uint64_t abytes; }; static inline uint16_t dv_audio_12to16(uint16_t sample) @@ -50,7 +50,7 @@ uint16_t shift, result; sample = (sample < 0x800) ? sample : sample | 0xf000; - shift = (sample & 0xf00) >> 8; + shift = (sample & 0xf00) >> 8; if (shift < 0x2 || shift > 0xd) { result = sample; @@ -76,16 +76,16 @@ switch (t) { case dv_audio_source: - offs = (80*6 + 80*16*3 + 3); - break; + offs = (80*6 + 80*16*3 + 3); + break; case dv_audio_control: - offs = (80*6 + 80*16*4 + 3); - break; + offs = (80*6 + 80*16*4 + 3); + break; case dv_video_control: - offs = (80*5 + 48 + 5); - break; + offs = (80*5 + 48 + 5); + break; default: - return NULL; + return NULL; } return frame[offs] == t ? &frame[offs] : NULL; @@ -111,20 +111,20 @@ if (!as_pack) /* No audio ? */ return 0; - smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */ - freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */ - quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */ + smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */ + freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */ + quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */ if (quant > 1) return -1; /* unsupported quantization */ size = (sys->audio_min_samples[freq] + smpls) * 4; /* 2ch, 2bytes */ - half_ch = sys->difseg_size/2; + half_ch = sys->difseg_size / 2; /* We work with 720p frames split in half, thus even frames have - * channels 0,1 and odd 2,3 */ - ipcm = (sys->height == 720 && !(frame[1]&0x0C))?2:0; - pcm = ppcm[ipcm++]; + * channels 0,1 and odd 2,3. */ + ipcm = (sys->height == 720 && !(frame[1] & 0x0C)) ? 2 : 0; + pcm = ppcm[ipcm++]; /* for each DIF channel */ for (chan = 0; chan < sys->n_difchan; chan++) { @@ -142,7 +142,7 @@ for (j = 0; j < 9; j++) { for (d = 8; d < 80; d += 2) { 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) continue; @@ -151,21 +151,21 @@ if (pcm[of*2+1] == 0x80 && pcm[of*2] == 0x00) pcm[of*2+1] = 0; } else { /* 12bit quantization */ - lc = ((uint16_t)frame[d] << 4) | + lc = ((uint16_t)frame[d] << 4) | ((uint16_t)frame[d+2] >> 4); rc = ((uint16_t)frame[d+1] << 4) | ((uint16_t)frame[d+2] & 0x0f); lc = (lc == 0x800 ? 0 : dv_audio_12to16(lc)); 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) continue; pcm[of*2] = lc & 0xff; // FIXME: maybe we have to admit pcm[of*2+1] = lc >> 8; // that DV is a big-endian PCM 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 pcm[of*2+1] = rc >> 8; // that DV is a big-endian PCM ++d; @@ -196,10 +196,10 @@ return 0; } - smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */ - freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */ - stype = (as_pack[3] & 0x1f); /* 0 - 2CH, 2 - 4CH, 3 - 8CH */ - quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */ + smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */ + freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */ + stype = (as_pack[3] & 0x1f); /* 0 - 2CH, 2 - 4CH, 3 - 8CH */ + quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */ /* note: ach counts PAIRS of channels (i.e. stereo channels) */ ach = ((int[4]){ 1, 0, 2, 4})[stype]; @@ -207,25 +207,25 @@ ach = 2; /* Dynamic handling of the audio streams in DV */ - for (i=0; i<ach; i++) { + for (i = 0; i < ach; i++) { if (!c->ast[i]) { c->ast[i] = av_new_stream(c->fctx, 0); if (!c->ast[i]) break; av_set_pts_info(c->ast[i], 64, 1, 30000); c->ast[i]->codec->codec_type = CODEC_TYPE_AUDIO; - c->ast[i]->codec->codec_id = CODEC_ID_PCM_S16LE; + c->ast[i]->codec->codec_id = CODEC_ID_PCM_S16LE; av_init_packet(&c->audio_pkt[i]); - c->audio_pkt[i].size = 0; - c->audio_pkt[i].data = c->audio_buf[i]; + c->audio_pkt[i].size = 0; + c->audio_pkt[i].data = c->audio_buf[i]; c->audio_pkt[i].stream_index = c->ast[i]->index; - c->audio_pkt[i].flags |= PKT_FLAG_KEY; + c->audio_pkt[i].flags |= PKT_FLAG_KEY; } c->ast[i]->codec->sample_rate = dv_audio_frequency[freq]; - c->ast[i]->codec->channels = 2; - c->ast[i]->codec->bit_rate = 2 * dv_audio_frequency[freq] * 16; - c->ast[i]->start_time = 0; + c->ast[i]->codec->channels = 2; + c->ast[i]->codec->bit_rate = 2 * dv_audio_frequency[freq] * 16; + c->ast[i]->start_time = 0; } c->ach = i; @@ -242,9 +242,10 @@ if (c->sys) { avctx = c->vst->codec; - av_set_pts_info(c->vst, 64, c->sys->time_base.num, c->sys->time_base.den); + av_set_pts_info(c->vst, 64, c->sys->time_base.num, + c->sys->time_base.den); avctx->time_base= c->sys->time_base; - if(!avctx->width){ + if (!avctx->width){ avctx->width = c->sys->width; avctx->height = c->sys->height; } @@ -252,9 +253,9 @@ /* finding out SAR is a little bit messy */ vsc_pack = dv_extract_pack(frame, dv_video_control); - apt = frame[4] & 0x07; - is16_9 = (vsc_pack && ((vsc_pack[2] & 0x07) == 0x02 || - (!apt && (vsc_pack[2] & 0x07) == 0x07))); + apt = frame[4] & 0x07; + is16_9 = (vsc_pack && ((vsc_pack[2] & 0x07) == 0x02 || + (!apt && (vsc_pack[2] & 0x07) == 0x07))); c->vst->sample_aspect_ratio = c->sys->sar[is16_9]; avctx->bit_rate = av_rescale_q(c->sys->frame_size, (AVRational){8,1}, c->sys->time_base); @@ -281,17 +282,17 @@ return NULL; } - c->sys = NULL; + c->sys = NULL; c->fctx = s; memset(c->ast, 0, sizeof(c->ast)); - c->ach = 0; + c->ach = 0; c->frames = 0; c->abytes = 0; c->vst->codec->codec_type = CODEC_TYPE_VIDEO; - c->vst->codec->codec_id = CODEC_ID_DVVIDEO; - c->vst->codec->bit_rate = 25000000; - c->vst->start_time = 0; + c->vst->codec->codec_id = CODEC_ID_DVVIDEO; + c->vst->codec->bit_rate = 25000000; + c->vst->start_time = 0; return c; } @@ -301,7 +302,7 @@ int size = -1; int i; - for (i=0; i<c->ach; i++) { + for (i = 0; i < c->ach; i++) { if (c->ast[i] && c->audio_pkt[i].size) { *pkt = c->audio_pkt[i]; c->audio_pkt[i].size = 0; @@ -328,7 +329,7 @@ /* Queueing audio packet */ /* FIXME: in case of no audio/bad audio we have to do something */ size = dv_extract_audio_info(c, buf); - for (i=0; i<c->ach; i++) { + for (i = 0; i < c->ach; i++) { c->audio_pkt[i].size = size; c->audio_pkt[i].pts = c->abytes * 30000*8 / c->ast[i]->codec->bit_rate; ppcm[i] = c->audio_buf[i]; @@ -339,7 +340,7 @@ /* We work with 720p frames split in half, thus even frames have * channels 0,1 and odd 2,3. */ if (c->sys->height == 720) { - if (buf[1]&0x0C) + if (buf[1] & 0x0C) c->audio_pkt[2].size = c->audio_pkt[3].size = 0; else c->audio_pkt[0].size = c->audio_pkt[1].size = 0; @@ -348,11 +349,11 @@ /* Now it's time to return video packet */ size = dv_extract_video_info(c, buf); av_init_packet(pkt); - pkt->data = buf; - pkt->size = size; - pkt->flags |= PKT_FLAG_KEY; + pkt->data = buf; + pkt->size = size; + pkt->flags |= PKT_FLAG_KEY; pkt->stream_index = c->vst->id; - pkt->pts = c->frames; + pkt->pts = c->frames; c->frames++; @@ -442,14 +443,14 @@ static int dv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { - RawDVContext *r = s->priv_data; + RawDVContext *r = s->priv_data; DVDemuxContext *c = r->dv_demux; - int64_t offset= dv_frame_offset(s, c, timestamp, flags); + int64_t offset = dv_frame_offset(s, c, timestamp, flags); dv_offset_reset(c, offset / c->sys->frame_size); offset = url_fseek(s->pb, offset, SEEK_SET); - return (offset < 0)?offset:0; + return (offset < 0) ? offset : 0; } static int dv_read_close(AVFormatContext *s)
--- a/dvenc.c Fri Oct 24 21:37:06 2008 +0000 +++ b/dvenc.c Fri Oct 24 21:41:27 2008 +0000 @@ -38,12 +38,12 @@ const DVprofile* sys; /* current DV profile, e.g.: 525/60, 625/50 */ int n_ast; /* number of stereo audio streams (up to 2) */ AVStream *ast[2]; /* stereo audio streams */ - AVFifoBuffer audio_data[2]; /* FIFO for storing excessive amounts of PCM */ + AVFifoBuffer audio_data[2]; /* FIFO for storing excessive amounts of PCM */ int frames; /* current frame number */ time_t start_time; /* recording start time */ - int has_audio; /* frame under contruction has audio */ - int has_video; /* frame under contruction has video */ - uint8_t frame_buf[DV_MAX_FRAME_SIZE]; /* frame under contruction */ + int has_audio; /* frame under contruction has audio */ + int has_video; /* frame under contruction has video */ + uint8_t frame_buf[DV_MAX_FRAME_SIZE]; /* frame under contruction */ }; static const int dv_aaux_packs_dist[12][9] = { @@ -63,7 +63,7 @@ static int dv_audio_frame_size(const DVprofile* sys, int frame) { - return sys->audio_samples_dist[frame % (sizeof(sys->audio_samples_dist)/ + return sys->audio_samples_dist[frame % (sizeof(sys->audio_samples_dist) / sizeof(sys->audio_samples_dist[0]))]; } @@ -77,14 +77,14 @@ buf[0] = (uint8_t)pack_id; switch (pack_id) { case dv_timecode: - ct = (time_t)av_rescale_rnd(c->frames, c->sys->time_base.num, c->sys->time_base.den, - AV_ROUND_DOWN); + ct = (time_t)av_rescale_rnd(c->frames, c->sys->time_base.num, + c->sys->time_base.den, AV_ROUND_DOWN); brktimegm(ct, &tc); /* * LTC drop-frame frame counter drops two frames (0 and 1) every * minute, unless it is exactly divisible by 10 */ - ltc_frame = (c->frames + 2*ct/60 - 2*ct/600) % c->sys->ltc_divisor; + ltc_frame = (c->frames + 2 * ct / 60 - 2 * ct / 600) % c->sys->ltc_divisor; buf[1] = (0 << 7) | /* color frame: 0 - unsync; 1 - sync mode */ (1 << 6) | /* drop frame timecode: 0 - nondrop; 1 - drop */ ((ltc_frame / 10) << 4) | /* tens of frames */ @@ -132,14 +132,14 @@ 7; buf[3] = (1 << 7) | /* direction: 1 -- forward */ (c->sys->pix_fmt == PIX_FMT_YUV420P ? 0x20 : /* speed */ - c->sys->ltc_divisor*4); + c->sys->ltc_divisor * 4); buf[4] = (1 << 7) | /* reserved -- always 1 */ 0x7f; /* genre category */ break; case dv_audio_recdate: case dv_video_recdate: /* VAUX recording date */ ct = c->start_time + av_rescale_rnd(c->frames, c->sys->time_base.num, - c->sys->time_base.den, AV_ROUND_DOWN); + c->sys->time_base.den, AV_ROUND_DOWN); brktimegm(ct, &tc); buf[1] = 0xff; /* ds, tm, tens of time zone, units of time zone */ /* 0xff is very likely to be "unknown" */ @@ -264,10 +264,10 @@ } /* Let us see if we have enough data to construct one DV frame. */ - if (c->has_video == 1 && c->has_audio + 1 == 1<<c->n_ast) { + if (c->has_video == 1 && c->has_audio + 1 == 1 << c->n_ast) { dv_inject_metadata(c, *frame); c->has_audio = 0; - for (i=0; i<c->n_ast; i++) { + for (i=0; i < c->n_ast; i++) { dv_inject_audio(c, i, *frame); av_fifo_drain(&c->audio_data[i], reqasize); c->has_audio |= ((reqasize <= av_fifo_size(&c->audio_data[i])) << i); @@ -293,7 +293,7 @@ if (s->nb_streams > 3) return NULL; - c->n_ast = 0; + c->n_ast = 0; c->ast[0] = c->ast[1] = NULL; /* We have to sort out where audio and where video stream is */ @@ -316,29 +316,29 @@ if (!vst || vst->codec->codec_id != CODEC_ID_DVVIDEO) goto bail_out; for (i=0; i<c->n_ast; i++) { - if (c->ast[i] && (c->ast[i]->codec->codec_id != CODEC_ID_PCM_S16LE || + if (c->ast[i] && (c->ast[i]->codec->codec_id != CODEC_ID_PCM_S16LE || c->ast[i]->codec->sample_rate != 48000 || - c->ast[i]->codec->channels != 2)) + c->ast[i]->codec->channels != 2)) goto bail_out; } c->sys = dv_codec_profile(vst->codec); if (!c->sys) goto bail_out; - if((c->n_ast > 1) && (c->sys->n_difchan < 2)) { + if ((c->n_ast > 1) && (c->sys->n_difchan < 2)) { /* only 1 stereo pair is allowed in 25Mbps mode */ goto bail_out; } /* Ok, everything seems to be in working order */ - c->frames = 0; - c->has_audio = 0; - c->has_video = 0; + c->frames = 0; + c->has_audio = 0; + c->has_video = 0; c->start_time = (time_t)s->timestamp; - for (i=0; i<c->n_ast; i++) { + for (i=0; i < c->n_ast; i++) { if (c->ast[i] && av_fifo_init(&c->audio_data[i], 100*AVCODEC_MAX_AUDIO_FRAME_SIZE) < 0) { - while (i>0) { + while (i > 0) { i--; av_fifo_free(&c->audio_data[i]); }