mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
a369a6b858
* qatar/master: (29 commits) fate: add golomb-test golomb-test: K&R formatting cosmetics h264: Split h264-test off into a separate file - golomb-test.c. h264-test: cleanup: drop timer invocations, commented out code and other cruft h264-test: Remove unused DSP and AVCodec contexts and related init calls. adpcm: Add missing stdint.h #include to fix standalone header compilation. lavf: add functions for accessing the fourcc<->CodecID mapping tables. lavc: set AVCodecContext.codec in avcodec_get_context_defaults3(). lavc: make avcodec_close() work properly on unopened codecs. lavc: add avcodec_is_open(). lavf: rename AVInputFormat.value to raw_codec_id. lavf: remove the pointless value field from flv and iv8 lavc/lavf: remove unnecessary symbols from the symbol version script. lavc: reorder AVCodec fields. lavf: reorder AVInput/OutputFormat fields. mp3dec: Fix a heap-buffer-overflow adpcmenc: remove some unneeded casts adpcmenc: use int16_t and uint8_t instead of short and unsigned char. adpcmenc: fix adpcm_ms extradata allocation adpcmenc: return proper AVERROR codes instead of -1 ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/adpcmenc.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/libavcodec.v libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/options.c libavformat/Makefile libavformat/avformat.h libavformat/flvdec.c libavformat/libavformat.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
74 lines
2.2 KiB
C
74 lines
2.2 KiB
C
/*
|
|
* RAW Ingenient MJPEG demuxer
|
|
* Copyright (c) 2005 Alex Beregszaszi
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "avformat.h"
|
|
#include "rawdec.h"
|
|
|
|
// http://www.artificis.hu/files/texts/ingenient.txt
|
|
static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
|
|
{
|
|
int ret, size, w, h, unk1, unk2;
|
|
|
|
if (avio_rl32(s->pb) != MKTAG('M', 'J', 'P', 'G'))
|
|
return AVERROR(EIO); // FIXME
|
|
|
|
size = avio_rl32(s->pb);
|
|
|
|
w = avio_rl16(s->pb);
|
|
h = avio_rl16(s->pb);
|
|
|
|
avio_skip(s->pb, 8); // zero + size (padded?)
|
|
avio_skip(s->pb, 2);
|
|
unk1 = avio_rl16(s->pb);
|
|
unk2 = avio_rl16(s->pb);
|
|
avio_skip(s->pb, 22); // ASCII timestamp
|
|
|
|
av_log(s, AV_LOG_DEBUG, "Ingenient packet: size=%d, width=%d, height=%d, unk1=%d unk2=%d\n",
|
|
size, w, h, unk1, unk2);
|
|
|
|
if (av_new_packet(pkt, size) < 0)
|
|
return AVERROR(ENOMEM);
|
|
|
|
pkt->pos = avio_tell(s->pb);
|
|
pkt->stream_index = 0;
|
|
ret = avio_read(s->pb, pkt->data, size);
|
|
if (ret < 0) {
|
|
av_free_packet(pkt);
|
|
return ret;
|
|
}
|
|
pkt->size = ret;
|
|
return ret;
|
|
}
|
|
|
|
FF_RAWVIDEO_DEMUXER_CLASS(ingenient)
|
|
|
|
AVInputFormat ff_ingenient_demuxer = {
|
|
.name = "ingenient",
|
|
.long_name = NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
|
|
.priv_data_size = sizeof(FFRawVideoDemuxerContext),
|
|
.read_header = ff_raw_video_read_header,
|
|
.read_packet = ingenient_read_packet,
|
|
.flags= AVFMT_GENERIC_INDEX,
|
|
.extensions = "cgi", // FIXME
|
|
.raw_codec_id = CODEC_ID_MJPEG,
|
|
.priv_class = &ingenient_demuxer_class,
|
|
};
|