X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavformat%2Fdv.c;h=d713acb5805e83d5aa2a547f11064d03bbc8a4ea;hp=1f152a2fba35026924862bc74adc6de1999c0285;hb=118e91f3d841435c50df4e110eb108d720cdcecf;hpb=abac6175916c57f59ddb51ffe41bfd1d9851fe38 diff --git a/libavformat/dv.c b/libavformat/dv.c index 1f152a2fba..d713acb580 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "avformat.h" - -#define NTSC_FRAME_SIZE 120000 -#define PAL_FRAME_SIZE 144000 +#include "dvcore.h" typedef struct DVDemuxContext { - int is_audio; + int is_audio; + uint8_t buf[144000]; + int size; } DVDemuxContext; /* raw input */ @@ -30,50 +30,57 @@ static int dv_read_header(AVFormatContext *s, AVFormatParameters *ap) { AVStream *vst, *ast; + DVDemuxContext *c = s->priv_data; vst = av_new_stream(s, 0); if (!vst) return AVERROR_NOMEM; vst->codec.codec_type = CODEC_TYPE_VIDEO; vst->codec.codec_id = CODEC_ID_DVVIDEO; + vst->codec.bit_rate = 25000000; -#if 0 ast = av_new_stream(s, 1); if (!ast) return AVERROR_NOMEM; ast->codec.codec_type = CODEC_TYPE_AUDIO; ast->codec.codec_id = CODEC_ID_DVAUDIO; -#endif + c->is_audio = 0; + return 0; } -/* XXX: build fake audio stream when DV audio decoder will be finished */ +static void __destruct_pkt(struct AVPacket *pkt) +{ + pkt->data = NULL; pkt->size = 0; + return; +} + static int dv_read_packet(AVFormatContext *s, AVPacket *pkt) { - int ret, size, dsf; - uint8_t buf[4]; + int ret; + DVDemuxContext *c = s->priv_data; - ret = get_buffer(&s->pb, buf, 4); - if (ret <= 0) - return -EIO; - dsf = buf[3] & 0x80; - if (!dsf) - size = NTSC_FRAME_SIZE; - else - size = PAL_FRAME_SIZE; - - if (av_new_packet(pkt, size) < 0) - return -EIO; - - pkt->stream_index = 0; - memcpy(pkt->data, buf, 4); - ret = get_buffer(&s->pb, pkt->data + 4, size - 4); - if (ret <= 0) { - av_free_packet(pkt); - return -EIO; + if (!c->is_audio) { + ret = get_buffer(&s->pb, c->buf, 4); + if (ret <= 0) + return -EIO; + c->size = dv_frame_profile(&c->buf[0])->frame_size; + + ret = get_buffer(&s->pb, c->buf + 4, c->size - 4); + if (ret <= 0) + return -EIO; } - return ret; + + av_init_packet(pkt); + pkt->destruct = __destruct_pkt; + pkt->data = c->buf; + pkt->size = c->size; + pkt->stream_index = c->is_audio; + pkt->flags |= PKT_FLAG_KEY; + + c->is_audio = !c->is_audio; + return c->size; } static int dv_read_close(AVFormatContext *s) @@ -81,20 +88,16 @@ static int dv_read_close(AVFormatContext *s) return 0; } -static AVInputFormat dv_iformat = { - "dv", - "DV video format", - sizeof(DVDemuxContext), - NULL, - dv_read_header, - dv_read_packet, - dv_read_close, - .extensions = "dv", -}; - -#if 0 int dv_write_header(struct AVFormatContext *s) { + DVMuxContext *c = s->priv_data; + + if (s->nb_streams != 2 || dv_core_init(c, s->streams) != 0) { + fprintf(stderr, "Can't initialize DV format!\n" + "Make sure that you supply exactly two streams:\n" + " video: 25fps or 29.97fps, audio: 2ch/48Khz/PCM\n"); + return -1; + } return 0; } @@ -102,33 +105,60 @@ int dv_write_packet(struct AVFormatContext *s, int stream_index, unsigned char *buf, int size, int force_pts) { - put_buffer(&s->pb, buf, size); - put_flush_packet(&s->pb); + DVMuxContext *c = s->priv_data; + + if (stream_index == c->vst) + dv_assemble_frame(c, buf, NULL, 0); + else + dv_assemble_frame(c, NULL, buf, size); + + if (c->has_audio && c->has_video) { + put_buffer(&s->pb, &c->frame_buf[0], c->sys->frame_size); + put_flush_packet(&s->pb); + } + return 0; } +/* + * We might end up with some extra A/V data without matching counterpart. + * E.g. video data without enough audio to write the complete frame. + * Currently we simply drop the last frame. I don't know whether this + * is the best strategy of all + */ int dv_write_trailer(struct AVFormatContext *s) { + dv_core_delete((DVMuxContext *)s->priv_data); return 0; } +static AVInputFormat dv_iformat = { + "dv", + "DV video format", + sizeof(DVDemuxContext), + NULL, + dv_read_header, + dv_read_packet, + dv_read_close, + .extensions = "dv", +}; + AVOutputFormat dv_oformat = { "dv", "DV video format", NULL, "dv", - 0, + sizeof(DVMuxContext), + CODEC_ID_PCM_S16LE, CODEC_ID_DVVIDEO, - CODEC_ID_DVAUDIO, dv_write_header, dv_write_packet, dv_write_trailer, }; -#endif int dv_init(void) { av_register_input_format(&dv_iformat); - // av_register_output_format(&dv_oformat); + av_register_output_format(&dv_oformat); return 0; }