X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fdv.c;h=1e32125c23660bff8e9bb735cb40cca01324148e;hb=f27ac6d83c3d90cac49230480a8569a1651763bd;hp=c5fecd10fb0dbecb0164c32fba92f6e19d3103ec;hpb=51f4155fef36b35ff2053b98ee7edca25d65e5d0;p=ffmpeg diff --git a/libavformat/dv.c b/libavformat/dv.c index c5fecd10fb0..1e32125c236 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -6,7 +6,7 @@ * of DV technical info. * * Raw DV format - * Copyright (c) 2002 Fabrice Bellard. + * Copyright (c) 2002 Fabrice Bellard * * 50 Mbps (DVCPRO50) and 100 Mbps (DVCPRO HD) support * Copyright (c) 2006 Daniel Maas @@ -31,18 +31,19 @@ #include #include "avformat.h" #include "libavcodec/dvdata.h" +#include "libavutil/intreadwrite.h" #include "dv.h" 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 +51,7 @@ static inline uint16_t dv_audio_12to16(uint16_t sample) 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 +77,16 @@ static const uint8_t* dv_extract_pack(uint8_t* frame, enum dv_pack_type t) 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,19 +112,20 @@ static int dv_extract_audio(uint8_t* frame, uint8_t* ppcm[4], 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 */ + 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++]; + /* 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++]; /* for each DIF channel */ for (chan = 0; chan < sys->n_difchan; chan++) { @@ -141,7 +143,7 @@ static int dv_extract_audio(uint8_t* frame, uint8_t* ppcm[4], 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; @@ -150,21 +152,21 @@ static int dv_extract_audio(uint8_t* frame, uint8_t* ppcm[4], 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; @@ -195,10 +197,10 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame) 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]; @@ -206,25 +208,25 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame) ach = 2; /* Dynamic handling of the audio streams in DV */ - for (i=0; iast[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_type = AVMEDIA_TYPE_AUDIO; + 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 |= AV_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; @@ -241,9 +243,10 @@ static int dv_extract_video_info(DVDemuxContext *c, uint8_t* frame) 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; } @@ -251,9 +254,9 @@ static int dv_extract_video_info(DVDemuxContext *c, uint8_t* frame) /* 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); @@ -280,17 +283,17 @@ DVDemuxContext* dv_init_demux(AVFormatContext *s) 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_type = AVMEDIA_TYPE_VIDEO; + c->vst->codec->codec_id = CODEC_ID_DVVIDEO; + c->vst->codec->bit_rate = 25000000; + c->vst->start_time = 0; return c; } @@ -300,7 +303,7 @@ int dv_get_packet(DVDemuxContext *c, AVPacket *pkt) int size = -1; int i; - for (i=0; iach; 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; @@ -319,7 +322,7 @@ int dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, uint8_t *ppcm[4] = {0}; if (buf_size < DV_PROFILE_BYTES || - !(c->sys = dv_frame_profile(buf)) || + !(c->sys = ff_dv_frame_profile(c->sys, buf, buf_size)) || buf_size < c->sys->frame_size) { return -1; /* Broken frame, or not enough data */ } @@ -327,30 +330,34 @@ int dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, /* 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; iach; 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]; } dv_extract_audio(buf, ppcm, c->sys); - c->abytes += size; - /* We work with 720p frames split in half, thus even frames have channels 0,1 and odd 2,3 */ + /* 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 + } else { c->audio_pkt[0].size = c->audio_pkt[1].size = 0; + c->abytes += size; + } + } else { + c->abytes += size; } /* 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 |= AV_PKT_FLAG_KEY; pkt->stream_index = c->vst->id; - pkt->pts = c->frames; + pkt->pts = c->frames; c->frames++; @@ -361,17 +368,17 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c, int64_t timestamp, int flags) { // FIXME: sys may be wrong if last dv_read_packet() failed (buffer is junk) - const DVprofile* sys = dv_codec_profile(c->vst->codec); + const DVprofile* sys = ff_dv_codec_profile(c->vst->codec); int64_t offset; - int64_t size = url_fsize(s->pb); + int64_t size = avio_size(s->pb) - s->data_offset; int64_t max_offset = ((size-1) / sys->frame_size) * sys->frame_size; offset = sys->frame_size * timestamp; - if (offset > max_offset) offset = max_offset; + if (size >= 0 && offset > max_offset) offset = max_offset; else if (offset < 0) offset = 0; - return offset; + return offset + s->data_offset; } void dv_offset_reset(DVDemuxContext *c, int64_t frame_offset) @@ -396,17 +403,35 @@ typedef struct RawDVContext { static int dv_read_header(AVFormatContext *s, AVFormatParameters *ap) { + unsigned state, marker_pos = 0; RawDVContext *c = s->priv_data; c->dv_demux = dv_init_demux(s); if (!c->dv_demux) return -1; - if (get_buffer(s->pb, c->buf, DV_PROFILE_BYTES) <= 0 || - url_fseek(s->pb, -DV_PROFILE_BYTES, SEEK_CUR) < 0) + state = avio_rb32(s->pb); + while ((state & 0xffffff7f) != 0x1f07003f) { + if (url_feof(s->pb)) { + av_log(s, AV_LOG_ERROR, "Cannot find DV header.\n"); + return -1; + } + if (state == 0x003f0700 || state == 0xff3f0700) + marker_pos = avio_tell(s->pb); + if (state == 0xff3f0701 && avio_tell(s->pb) - marker_pos == 80) { + avio_seek(s->pb, -163, SEEK_CUR); + state = avio_rb32(s->pb); + break; + } + state = (state << 8) | avio_r8(s->pb); + } + AV_WB32(c->buf, state); + + if (avio_read(s->pb, c->buf + 4, DV_PROFILE_BYTES - 4) <= 0 || + avio_seek(s->pb, -DV_PROFILE_BYTES, SEEK_CUR) < 0) return AVERROR(EIO); - c->dv_demux->sys = dv_frame_profile(c->buf); + c->dv_demux->sys = ff_dv_frame_profile(c->dv_demux->sys, c->buf, DV_PROFILE_BYTES); if (!c->dv_demux->sys) { av_log(s, AV_LOG_ERROR, "Can't determine profile of DV input stream.\n"); return -1; @@ -427,8 +452,10 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt) size = dv_get_packet(c->dv_demux, pkt); if (size < 0) { + if (!c->dv_demux->sys) + return AVERROR(EIO); size = c->dv_demux->sys->frame_size; - if (get_buffer(s->pb, c->buf, size) <= 0) + if (avio_read(s->pb, c->buf, size) <= 0) return AVERROR(EIO); size = dv_produce_packet(c->dv_demux, pkt, c->buf, size); @@ -440,14 +467,14 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt) 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; + offset = avio_seek(s->pb, offset, SEEK_SET); + return (offset < 0) ? offset : 0; } static int dv_read_close(AVFormatContext *s) @@ -457,12 +484,45 @@ static int dv_read_close(AVFormatContext *s) return 0; } -#ifdef CONFIG_DV_DEMUXER -AVInputFormat dv_demuxer = { +static int dv_probe(AVProbeData *p) +{ + unsigned state, marker_pos = 0; + int i; + int matches = 0; + int secondary_matches = 0; + + if (p->buf_size < 5) + return 0; + + state = AV_RB32(p->buf); + for (i = 4; i < p->buf_size; i++) { + if ((state & 0xffffff7f) == 0x1f07003f) + matches++; + // any section header, also with seq/chan num != 0, + // should appear around every 12000 bytes, at least 10 per frame + if ((state & 0xff07ff7f) == 0x1f07003f) + secondary_matches++; + if (state == 0x003f0700 || state == 0xff3f0700) + marker_pos = i; + if (state == 0xff3f0701 && i - marker_pos == 80) + matches++; + state = (state << 8) | p->buf[i]; + } + + if (matches && p->buf_size / matches < 1024*1024) { + if (matches > 4 || (secondary_matches >= 10 && p->buf_size / secondary_matches < 24000)) + return AVPROBE_SCORE_MAX*3/4; // not max to avoid dv in mov to match + return AVPROBE_SCORE_MAX/4; + } + return 0; +} + +#if CONFIG_DV_DEMUXER +AVInputFormat ff_dv_demuxer = { "dv", NULL_IF_CONFIG_SMALL("DV video format"), sizeof(RawDVContext), - NULL, + dv_probe, dv_read_header, dv_read_packet, dv_read_close,