mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-28 10:22:10 +00:00
move p*m from image/lavf -> image2/lavc
video/audio_codec_id in AVFormatParameters to override/help demuxer av_guess_codec() to guess the default codecs based upon muxer + filename Originally committed as revision 3668 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
parent
6c3890b6d3
commit
5b6d559680
14
ffmpeg.c
14
ffmpeg.c
@ -255,6 +255,9 @@ static int nb_frames_dup = 0;
|
||||
static int nb_frames_drop = 0;
|
||||
static int input_sync;
|
||||
|
||||
static int pgmyuv_compatibility_hack=0;
|
||||
|
||||
|
||||
#define DEFAULT_PASS_LOGFILENAME "ffmpeg2pass"
|
||||
|
||||
typedef struct AVOutputStream {
|
||||
@ -2015,8 +2018,9 @@ static void opt_format(const char *arg)
|
||||
{
|
||||
/* compatibility stuff for pgmyuv */
|
||||
if (!strcmp(arg, "pgmyuv")) {
|
||||
pgmyuv_compatibility_hack=1;
|
||||
opt_image_format(arg);
|
||||
arg = "image";
|
||||
arg = "image2";
|
||||
}
|
||||
|
||||
file_iformat = av_find_input_format(arg);
|
||||
@ -2782,6 +2786,10 @@ static void opt_input_file(const char *filename)
|
||||
ap->device = grab_device;
|
||||
ap->channel = video_channel;
|
||||
ap->standard = video_standard;
|
||||
ap->video_codec_id = video_codec_id;
|
||||
ap->audio_codec_id = audio_codec_id;
|
||||
if(pgmyuv_compatibility_hack)
|
||||
ap->video_codec_id= CODEC_ID_PGMYUV;
|
||||
|
||||
/* open the input file with generic libav function */
|
||||
err = av_open_input_file(&ic, filename, file_iformat, 0, ap);
|
||||
@ -3004,7 +3012,7 @@ static void opt_output_file(const char *filename)
|
||||
int i;
|
||||
AVCodec *codec;
|
||||
|
||||
codec_id = file_oformat->video_codec;
|
||||
codec_id = av_guess_codec(file_oformat, NULL, filename, NULL, CODEC_TYPE_VIDEO);
|
||||
if (video_codec_id != CODEC_ID_NONE)
|
||||
codec_id = video_codec_id;
|
||||
|
||||
@ -3253,7 +3261,7 @@ static void opt_output_file(const char *filename)
|
||||
st->stream_copy = 1;
|
||||
audio_enc->channels = audio_channels;
|
||||
} else {
|
||||
codec_id = file_oformat->audio_codec;
|
||||
codec_id = av_guess_codec(file_oformat, NULL, filename, NULL, CODEC_TYPE_AUDIO);
|
||||
if (audio_codec_id != CODEC_ID_NONE)
|
||||
codec_id = audio_codec_id;
|
||||
audio_enc->codec_id = codec_id;
|
||||
|
||||
@ -21,7 +21,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \
|
||||
msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \
|
||||
smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \
|
||||
flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o ulti.o h264idct.o \
|
||||
qdrw.o xl.o rangecoder.o png.o
|
||||
qdrw.o xl.o rangecoder.o png.o pnm.o
|
||||
|
||||
ifeq ($(AMR_NB),yes)
|
||||
ifeq ($(AMR_NB_FIXED),yes)
|
||||
|
||||
@ -77,6 +77,11 @@ void avcodec_register_all(void)
|
||||
#ifdef CONFIG_ZLIB
|
||||
register_avcodec(&png_encoder);
|
||||
#endif
|
||||
register_avcodec(&ppm_encoder);
|
||||
register_avcodec(&pgm_encoder);
|
||||
register_avcodec(&pgmyuv_encoder);
|
||||
register_avcodec(&pbm_encoder);
|
||||
register_avcodec(&pam_encoder);
|
||||
register_avcodec(&huffyuv_encoder);
|
||||
register_avcodec(&asv1_encoder);
|
||||
register_avcodec(&asv2_encoder);
|
||||
|
||||
@ -154,6 +154,11 @@ enum CodecID {
|
||||
CODEC_ID_XVID,
|
||||
|
||||
CODEC_ID_PNG,
|
||||
CODEC_ID_PPM,
|
||||
CODEC_ID_PBM,
|
||||
CODEC_ID_PGM,
|
||||
CODEC_ID_PGMYUV,
|
||||
CODEC_ID_PAM,
|
||||
};
|
||||
|
||||
/* CODEC_ID_MP3LAME is absolete */
|
||||
@ -1798,6 +1803,11 @@ extern AVCodec dvvideo_encoder;
|
||||
extern AVCodec mjpeg_encoder;
|
||||
extern AVCodec ljpeg_encoder;
|
||||
extern AVCodec png_encoder;
|
||||
extern AVCodec ppm_encoder;
|
||||
extern AVCodec pgm_encoder;
|
||||
extern AVCodec pgmyuv_encoder;
|
||||
extern AVCodec pbm_encoder;
|
||||
extern AVCodec pam_encoder;
|
||||
extern AVCodec mpeg4_encoder;
|
||||
extern AVCodec msmpeg4v1_encoder;
|
||||
extern AVCodec msmpeg4v2_encoder;
|
||||
|
||||
553
libavcodec/pnm.c
Normal file
553
libavcodec/pnm.c
Normal file
@ -0,0 +1,553 @@
|
||||
/*
|
||||
* PNM image format
|
||||
* Copyright (c) 2002, 2003 Fabrice Bellard.
|
||||
*
|
||||
* This library 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 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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 this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#include "avcodec.h"
|
||||
|
||||
typedef struct PNMContext {
|
||||
uint8_t *bytestream;
|
||||
uint8_t *bytestream_start;
|
||||
uint8_t *bytestream_end;
|
||||
AVFrame picture;
|
||||
} PNMContext;
|
||||
|
||||
static inline int pnm_space(int c)
|
||||
{
|
||||
return (c == ' ' || c == '\n' || c == '\r' || c == '\t');
|
||||
}
|
||||
|
||||
static void pnm_get(PNMContext *sc, char *str, int buf_size)
|
||||
{
|
||||
char *s;
|
||||
int c;
|
||||
|
||||
/* skip spaces and comments */
|
||||
for(;;) {
|
||||
c = *sc->bytestream++;
|
||||
if (c == '#') {
|
||||
do {
|
||||
c = *sc->bytestream++;
|
||||
} while (c != '\n' && sc->bytestream < sc->bytestream_end);
|
||||
} else if (!pnm_space(c)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
s = str;
|
||||
while (sc->bytestream < sc->bytestream_end && !pnm_space(c)) {
|
||||
if ((s - str) < buf_size - 1)
|
||||
*s++ = c;
|
||||
c = *sc->bytestream++;
|
||||
}
|
||||
*s = '\0';
|
||||
}
|
||||
|
||||
static int common_init(AVCodecContext *avctx){
|
||||
PNMContext *s = avctx->priv_data;
|
||||
|
||||
avcodec_get_frame_defaults((AVFrame*)&s->picture);
|
||||
avctx->coded_frame= (AVFrame*)&s->picture;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int pnm_decode_frame(AVCodecContext *avctx,
|
||||
void *data, int *data_size,
|
||||
uint8_t *buf, int buf_size)
|
||||
{
|
||||
PNMContext * const s = avctx->priv_data;
|
||||
AVFrame *picture = data;
|
||||
AVFrame * const p= (AVFrame*)&s->picture;
|
||||
int i, n, linesize, h;
|
||||
char buf1[32];
|
||||
unsigned char *ptr;
|
||||
|
||||
/* special case for last picture */
|
||||
if (buf_size == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
s->bytestream_start=
|
||||
s->bytestream= buf;
|
||||
s->bytestream_end= buf + buf_size;
|
||||
|
||||
pnm_get(s, buf1, sizeof(buf1));
|
||||
if (!strcmp(buf1, "P4")) {
|
||||
avctx->pix_fmt = PIX_FMT_MONOWHITE;
|
||||
} else if (!strcmp(buf1, "P5")) {
|
||||
if (avctx->codec_id == CODEC_ID_PGMYUV)
|
||||
avctx->pix_fmt = PIX_FMT_YUV420P;
|
||||
else
|
||||
avctx->pix_fmt = PIX_FMT_GRAY8;
|
||||
} else if (!strcmp(buf1, "P6")) {
|
||||
avctx->pix_fmt = PIX_FMT_RGB24;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
pnm_get(s, buf1, sizeof(buf1));
|
||||
avctx->width = atoi(buf1);
|
||||
if (avctx->width <= 0)
|
||||
return -1;
|
||||
pnm_get(s, buf1, sizeof(buf1));
|
||||
avctx->height = atoi(buf1);
|
||||
if (avctx->height <= 0)
|
||||
return -1;
|
||||
if (avctx->pix_fmt != PIX_FMT_MONOWHITE) {
|
||||
pnm_get(s, buf1, sizeof(buf1));
|
||||
}
|
||||
|
||||
/* more check if YUV420 */
|
||||
if (avctx->pix_fmt == PIX_FMT_YUV420P) {
|
||||
if ((avctx->width & 1) != 0)
|
||||
return -1;
|
||||
h = (avctx->height * 2);
|
||||
if ((h % 3) != 0)
|
||||
return -1;
|
||||
h /= 3;
|
||||
avctx->height = h;
|
||||
}
|
||||
|
||||
if(p->data[0])
|
||||
avctx->release_buffer(avctx, p);
|
||||
|
||||
p->reference= 0;
|
||||
if(avctx->get_buffer(avctx, p) < 0){
|
||||
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
||||
return -1;
|
||||
}
|
||||
p->pict_type= FF_I_TYPE;
|
||||
p->key_frame= 1;
|
||||
|
||||
switch(avctx->pix_fmt) {
|
||||
default:
|
||||
return -1;
|
||||
case PIX_FMT_RGB24:
|
||||
n = avctx->width * 3;
|
||||
goto do_read;
|
||||
case PIX_FMT_GRAY8:
|
||||
n = avctx->width;
|
||||
goto do_read;
|
||||
case PIX_FMT_MONOWHITE:
|
||||
n = (avctx->width + 7) >> 3;
|
||||
do_read:
|
||||
ptr = p->data[0];
|
||||
linesize = p->linesize[0];
|
||||
for(i = 0; i < avctx->height; i++) {
|
||||
memcpy(ptr, s->bytestream, n);
|
||||
s->bytestream += n;
|
||||
ptr += linesize;
|
||||
}
|
||||
break;
|
||||
case PIX_FMT_YUV420P:
|
||||
{
|
||||
unsigned char *ptr1, *ptr2;
|
||||
|
||||
n = avctx->width;
|
||||
ptr = p->data[0];
|
||||
linesize = p->linesize[0];
|
||||
for(i = 0; i < avctx->height; i++) {
|
||||
memcpy(ptr, s->bytestream, n);
|
||||
s->bytestream += n;
|
||||
ptr += linesize;
|
||||
}
|
||||
ptr1 = p->data[1];
|
||||
ptr2 = p->data[2];
|
||||
n >>= 1;
|
||||
h = avctx->height >> 1;
|
||||
for(i = 0; i < h; i++) {
|
||||
memcpy(ptr1, s->bytestream, n);
|
||||
s->bytestream += n;
|
||||
memcpy(ptr2, s->bytestream, n);
|
||||
s->bytestream += n;
|
||||
ptr1 += p->linesize[1];
|
||||
ptr2 += p->linesize[2];
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
*picture= *(AVFrame*)&s->picture;
|
||||
*data_size = sizeof(AVPicture);
|
||||
|
||||
return s->bytestream - s->bytestream_start;
|
||||
}
|
||||
|
||||
static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int buf_size, void *data){
|
||||
PNMContext *s = avctx->priv_data;
|
||||
AVFrame *pict = data;
|
||||
AVFrame * const p= (AVFrame*)&s->picture;
|
||||
int i, h, h1, c, n, linesize;
|
||||
uint8_t *ptr, *ptr1, *ptr2;
|
||||
|
||||
*p = *pict;
|
||||
p->pict_type= FF_I_TYPE;
|
||||
p->key_frame= 1;
|
||||
|
||||
s->bytestream_start=
|
||||
s->bytestream= outbuf;
|
||||
s->bytestream_end= outbuf+buf_size;
|
||||
|
||||
h = avctx->height;
|
||||
h1 = h;
|
||||
switch(avctx->pix_fmt) {
|
||||
case PIX_FMT_MONOWHITE:
|
||||
c = '4';
|
||||
n = (avctx->width + 7) >> 3;
|
||||
break;
|
||||
case PIX_FMT_GRAY8:
|
||||
c = '5';
|
||||
n = avctx->width;
|
||||
break;
|
||||
case PIX_FMT_RGB24:
|
||||
c = '6';
|
||||
n = avctx->width * 3;
|
||||
break;
|
||||
case PIX_FMT_YUV420P:
|
||||
c = '5';
|
||||
n = avctx->width;
|
||||
h1 = (h * 3) / 2;
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
snprintf(s->bytestream, s->bytestream_end - s->bytestream,
|
||||
"P%c\n%d %d\n",
|
||||
c, avctx->width, h1);
|
||||
s->bytestream += strlen(s->bytestream);
|
||||
if (avctx->pix_fmt != PIX_FMT_MONOWHITE) {
|
||||
snprintf(s->bytestream, s->bytestream_end - s->bytestream,
|
||||
"%d\n", 255);
|
||||
s->bytestream += strlen(s->bytestream);
|
||||
}
|
||||
|
||||
ptr = p->data[0];
|
||||
linesize = p->linesize[0];
|
||||
for(i=0;i<h;i++) {
|
||||
memcpy(s->bytestream, ptr, n);
|
||||
s->bytestream += n;
|
||||
ptr += linesize;
|
||||
}
|
||||
|
||||
if (avctx->pix_fmt == PIX_FMT_YUV420P) {
|
||||
h >>= 1;
|
||||
n >>= 1;
|
||||
ptr1 = p->data[1];
|
||||
ptr2 = p->data[2];
|
||||
for(i=0;i<h;i++) {
|
||||
memcpy(s->bytestream, ptr1, n);
|
||||
s->bytestream += n;
|
||||
memcpy(s->bytestream, ptr2, n);
|
||||
s->bytestream += n;
|
||||
ptr1 += p->linesize[1];
|
||||
ptr2 += p->linesize[2];
|
||||
}
|
||||
}
|
||||
return s->bytestream - s->bytestream_start;
|
||||
}
|
||||
|
||||
static int pam_decode_frame(AVCodecContext *avctx,
|
||||
void *data, int *data_size,
|
||||
uint8_t *buf, int buf_size)
|
||||
{
|
||||
PNMContext * const s = avctx->priv_data;
|
||||
AVFrame *picture = data;
|
||||
AVFrame * const p= (AVFrame*)&s->picture;
|
||||
int i, n, linesize, h, w, depth, maxval;
|
||||
char buf1[32], tuple_type[32];
|
||||
unsigned char *ptr;
|
||||
|
||||
/* special case for last picture */
|
||||
if (buf_size == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
s->bytestream_start=
|
||||
s->bytestream= buf;
|
||||
s->bytestream_end= buf + buf_size;
|
||||
|
||||
pnm_get(s, buf1, sizeof(buf1));
|
||||
if (strcmp(buf1, "P7") != 0)
|
||||
return -1;
|
||||
w = -1;
|
||||
h = -1;
|
||||
maxval = -1;
|
||||
depth = -1;
|
||||
tuple_type[0] = '\0';
|
||||
for(;;) {
|
||||
pnm_get(s, buf1, sizeof(buf1));
|
||||
if (!strcmp(buf1, "WIDTH")) {
|
||||
pnm_get(s, buf1, sizeof(buf1));
|
||||
w = strtol(buf1, NULL, 10);
|
||||
} else if (!strcmp(buf1, "HEIGHT")) {
|
||||
pnm_get(s, buf1, sizeof(buf1));
|
||||
h = strtol(buf1, NULL, 10);
|
||||
} else if (!strcmp(buf1, "DEPTH")) {
|
||||
pnm_get(s, buf1, sizeof(buf1));
|
||||
depth = strtol(buf1, NULL, 10);
|
||||
} else if (!strcmp(buf1, "MAXVAL")) {
|
||||
pnm_get(s, buf1, sizeof(buf1));
|
||||
maxval = strtol(buf1, NULL, 10);
|
||||
} else if (!strcmp(buf1, "TUPLETYPE")) {
|
||||
pnm_get(s, tuple_type, sizeof(tuple_type));
|
||||
} else if (!strcmp(buf1, "ENDHDR")) {
|
||||
break;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
/* check that all tags are present */
|
||||
if (w <= 0 || h <= 0 || maxval <= 0 || depth <= 0 || tuple_type[0] == '\0')
|
||||
return -1;
|
||||
avctx->width = w;
|
||||
avctx->height = h;
|
||||
if (depth == 1) {
|
||||
if (maxval == 1)
|
||||
avctx->pix_fmt = PIX_FMT_MONOWHITE;
|
||||
else
|
||||
avctx->pix_fmt = PIX_FMT_GRAY8;
|
||||
} else if (depth == 3) {
|
||||
avctx->pix_fmt = PIX_FMT_RGB24;
|
||||
} else if (depth == 4) {
|
||||
avctx->pix_fmt = PIX_FMT_RGBA32;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(p->data[0])
|
||||
avctx->release_buffer(avctx, p);
|
||||
|
||||
p->reference= 0;
|
||||
if(avctx->get_buffer(avctx, p) < 0){
|
||||
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
||||
return -1;
|
||||
}
|
||||
p->pict_type= FF_I_TYPE;
|
||||
p->key_frame= 1;
|
||||
|
||||
switch(avctx->pix_fmt) {
|
||||
default:
|
||||
return -1;
|
||||
case PIX_FMT_RGB24:
|
||||
n = avctx->width * 3;
|
||||
goto do_read;
|
||||
case PIX_FMT_GRAY8:
|
||||
n = avctx->width;
|
||||
goto do_read;
|
||||
case PIX_FMT_MONOWHITE:
|
||||
n = (avctx->width + 7) >> 3;
|
||||
do_read:
|
||||
ptr = p->data[0];
|
||||
linesize = p->linesize[0];
|
||||
for(i = 0; i < avctx->height; i++) {
|
||||
memcpy(ptr, s->bytestream, n);
|
||||
s->bytestream += n;
|
||||
ptr += linesize;
|
||||
}
|
||||
break;
|
||||
case PIX_FMT_RGBA32:
|
||||
ptr = p->data[0];
|
||||
linesize = p->linesize[0];
|
||||
for(i = 0; i < avctx->height; i++) {
|
||||
int j, r, g, b, a;
|
||||
|
||||
for(j = 0;j < w; j++) {
|
||||
r = *s->bytestream++;
|
||||
g = *s->bytestream++;
|
||||
b = *s->bytestream++;
|
||||
a = *s->bytestream++;
|
||||
((uint32_t *)ptr)[j] = (a << 24) | (r << 16) | (g << 8) | b;
|
||||
}
|
||||
ptr += linesize;
|
||||
}
|
||||
break;
|
||||
}
|
||||
*picture= *(AVFrame*)&s->picture;
|
||||
*data_size = sizeof(AVPicture);
|
||||
|
||||
return s->bytestream - s->bytestream_start;
|
||||
}
|
||||
|
||||
static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int buf_size, void *data){
|
||||
PNMContext *s = avctx->priv_data;
|
||||
AVFrame *pict = data;
|
||||
AVFrame * const p= (AVFrame*)&s->picture;
|
||||
int i, h, w, n, linesize, depth, maxval;
|
||||
const char *tuple_type;
|
||||
uint8_t *ptr;
|
||||
|
||||
*p = *pict;
|
||||
p->pict_type= FF_I_TYPE;
|
||||
p->key_frame= 1;
|
||||
|
||||
s->bytestream_start=
|
||||
s->bytestream= outbuf;
|
||||
s->bytestream_end= outbuf+buf_size;
|
||||
|
||||
h = avctx->height;
|
||||
w = avctx->width;
|
||||
switch(avctx->pix_fmt) {
|
||||
case PIX_FMT_MONOWHITE:
|
||||
n = (w + 7) >> 3;
|
||||
depth = 1;
|
||||
maxval = 1;
|
||||
tuple_type = "BLACKANDWHITE";
|
||||
break;
|
||||
case PIX_FMT_GRAY8:
|
||||
n = w;
|
||||
depth = 1;
|
||||
maxval = 255;
|
||||
tuple_type = "GRAYSCALE";
|
||||
break;
|
||||
case PIX_FMT_RGB24:
|
||||
n = w * 3;
|
||||
depth = 3;
|
||||
maxval = 255;
|
||||
tuple_type = "RGB";
|
||||
break;
|
||||
case PIX_FMT_RGBA32:
|
||||
n = w * 4;
|
||||
depth = 4;
|
||||
maxval = 255;
|
||||
tuple_type = "RGB_ALPHA";
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
snprintf(s->bytestream, s->bytestream_end - s->bytestream,
|
||||
"P7\nWIDTH %d\nHEIGHT %d\nDEPTH %d\nMAXVAL %d\nTUPLETYPE %s\nENDHDR\n",
|
||||
w, h, depth, maxval, tuple_type);
|
||||
s->bytestream += strlen(s->bytestream);
|
||||
|
||||
ptr = p->data[0];
|
||||
linesize = p->linesize[0];
|
||||
|
||||
if (avctx->pix_fmt == PIX_FMT_RGBA32) {
|
||||
int j;
|
||||
unsigned int v;
|
||||
|
||||
for(i=0;i<h;i++) {
|
||||
for(j=0;j<w;j++) {
|
||||
v = ((uint32_t *)ptr)[j];
|
||||
*s->bytestream++ = v >> 16;
|
||||
*s->bytestream++ = v >> 8;
|
||||
*s->bytestream++ = v;
|
||||
*s->bytestream++ = v >> 24;
|
||||
}
|
||||
ptr += linesize;
|
||||
}
|
||||
} else {
|
||||
for(i=0;i<h;i++) {
|
||||
memcpy(s->bytestream, ptr, n);
|
||||
s->bytestream += n;
|
||||
ptr += linesize;
|
||||
}
|
||||
}
|
||||
return s->bytestream - s->bytestream_start;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static int pnm_probe(AVProbeData *pd)
|
||||
{
|
||||
const char *p = pd->buf;
|
||||
if (pd->buf_size >= 8 &&
|
||||
p[0] == 'P' &&
|
||||
p[1] >= '4' && p[1] <= '6' &&
|
||||
pnm_space(p[2]) )
|
||||
return AVPROBE_SCORE_MAX - 1; /* to permit pgmyuv probe */
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int pgmyuv_probe(AVProbeData *pd)
|
||||
{
|
||||
if (match_ext(pd->filename, "pgmyuv"))
|
||||
return AVPROBE_SCORE_MAX;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int pam_probe(AVProbeData *pd)
|
||||
{
|
||||
const char *p = pd->buf;
|
||||
if (pd->buf_size >= 8 &&
|
||||
p[0] == 'P' &&
|
||||
p[1] == '7' &&
|
||||
p[2] == '\n')
|
||||
return AVPROBE_SCORE_MAX;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
AVCodec pgm_encoder = {
|
||||
"pgm",
|
||||
CODEC_TYPE_VIDEO,
|
||||
CODEC_ID_PGM,
|
||||
sizeof(PNMContext),
|
||||
common_init,
|
||||
pnm_encode_frame,
|
||||
NULL, //encode_end,
|
||||
pnm_decode_frame,
|
||||
.pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, -1},
|
||||
};
|
||||
|
||||
AVCodec pgmyuv_encoder = {
|
||||
"pgmyuv",
|
||||
CODEC_TYPE_VIDEO,
|
||||
CODEC_ID_PGMYUV,
|
||||
sizeof(PNMContext),
|
||||
common_init,
|
||||
pnm_encode_frame,
|
||||
NULL, //encode_end,
|
||||
pnm_decode_frame,
|
||||
.pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
|
||||
};
|
||||
|
||||
AVCodec ppm_encoder = {
|
||||
"ppm",
|
||||
CODEC_TYPE_VIDEO,
|
||||
CODEC_ID_PPM,
|
||||
sizeof(PNMContext),
|
||||
common_init,
|
||||
pnm_encode_frame,
|
||||
NULL, //encode_end,
|
||||
pnm_decode_frame,
|
||||
.pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, -1},
|
||||
};
|
||||
|
||||
AVCodec pbm_encoder = {
|
||||
"pbm",
|
||||
CODEC_TYPE_VIDEO,
|
||||
CODEC_ID_PBM,
|
||||
sizeof(PNMContext),
|
||||
common_init,
|
||||
pnm_encode_frame,
|
||||
NULL, //encode_end,
|
||||
pnm_decode_frame,
|
||||
.pix_fmts= (enum PixelFormat[]){PIX_FMT_MONOWHITE, -1},
|
||||
};
|
||||
|
||||
AVCodec pam_encoder = {
|
||||
"pam",
|
||||
CODEC_TYPE_VIDEO,
|
||||
CODEC_ID_PAM,
|
||||
sizeof(PNMContext),
|
||||
common_init,
|
||||
pam_encode_frame,
|
||||
NULL, //encode_end,
|
||||
pam_decode_frame,
|
||||
.pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, -1},
|
||||
};
|
||||
@ -5,7 +5,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define LIBAVFORMAT_BUILD 4620
|
||||
#define LIBAVFORMAT_BUILD 4621
|
||||
|
||||
#define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT
|
||||
#define LIBAVFORMAT_VERSION FFMPEG_VERSION
|
||||
@ -115,6 +115,8 @@ typedef struct AVFormatParameters {
|
||||
mpeg2ts_raw is TRUE */
|
||||
int initial_pause:1; /* do not begin to play the stream
|
||||
immediately (RTSP only) */
|
||||
enum CodecID video_codec_id;
|
||||
enum CodecID audio_codec_id;
|
||||
} AVFormatParameters;
|
||||
|
||||
#define AVFMT_NOFILE 0x0001 /* no file should be opened */
|
||||
@ -358,6 +360,7 @@ typedef struct AVImageFormat {
|
||||
void av_register_image_format(AVImageFormat *img_fmt);
|
||||
AVImageFormat *av_probe_image_format(AVProbeData *pd);
|
||||
AVImageFormat *guess_image_format(const char *filename);
|
||||
enum CodecID av_guess_image2_codec(const char *filename);
|
||||
int av_read_image(ByteIOContext *pb, const char *filename,
|
||||
AVImageFormat *fmt,
|
||||
int (*alloc_cb)(void *, AVImageInfo *info), void *opaque);
|
||||
@ -521,6 +524,8 @@ AVOutputFormat *guess_stream_format(const char *short_name,
|
||||
const char *filename, const char *mime_type);
|
||||
AVOutputFormat *guess_format(const char *short_name,
|
||||
const char *filename, const char *mime_type);
|
||||
enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
|
||||
const char *filename, const char *mime_type, enum CodecType type);
|
||||
|
||||
void av_hex_dump(FILE *f, uint8_t *buf, int size);
|
||||
void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
|
||||
|
||||
@ -38,6 +38,11 @@ static const IdStrMap img_tags[] = {
|
||||
{ CODEC_ID_MJPEG , "jpg"},
|
||||
{ CODEC_ID_LJPEG , "ljpg"},
|
||||
{ CODEC_ID_PNG , "png"},
|
||||
{ CODEC_ID_PPM , "ppm"},
|
||||
{ CODEC_ID_PGM , "pgm"},
|
||||
{ CODEC_ID_PGMYUV , "pgmyuv"},
|
||||
{ CODEC_ID_PBM , "pbm"},
|
||||
{ CODEC_ID_PAM , "pam"},
|
||||
{ CODEC_ID_MPEG1VIDEO, "mpg1-img"},
|
||||
{ CODEC_ID_MPEG2VIDEO, "mpg2-img"},
|
||||
{ CODEC_ID_MPEG4 , "mpg4-img"},
|
||||
@ -133,6 +138,10 @@ static int image_probe(AVProbeData *p)
|
||||
return 0;
|
||||
}
|
||||
|
||||
enum CodecID av_guess_image2_codec(const char *filename){
|
||||
return av_str2id(img_tags, filename);
|
||||
}
|
||||
|
||||
static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
|
||||
{
|
||||
VideoData *s = s1->priv_data;
|
||||
@ -180,8 +189,16 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
|
||||
st->codec.frame_rate_base) / st->codec.frame_rate;
|
||||
}
|
||||
|
||||
st->codec.codec_type = CODEC_TYPE_VIDEO;
|
||||
st->codec.codec_id = av_str2id(img_tags, s->path);
|
||||
if(ap->video_codec_id){
|
||||
st->codec.codec_type = CODEC_TYPE_VIDEO;
|
||||
st->codec.codec_id = ap->video_codec_id;
|
||||
}else if(ap->audio_codec_id){
|
||||
st->codec.codec_type = CODEC_TYPE_AUDIO;
|
||||
st->codec.codec_id = ap->audio_codec_id;
|
||||
}else{
|
||||
st->codec.codec_type = CODEC_TYPE_VIDEO;
|
||||
st->codec.codec_id = av_str2id(img_tags, s->path);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
|
||||
@ -77,6 +77,11 @@ AVOutputFormat *guess_format(const char *short_name, const char *filename,
|
||||
int score_max, score;
|
||||
|
||||
/* specific test for image sequences */
|
||||
if (!short_name && filename &&
|
||||
filename_number_test(filename) >= 0 &&
|
||||
av_guess_image2_codec(filename) != CODEC_ID_NONE) {
|
||||
return guess_format("image2", NULL, NULL);
|
||||
}
|
||||
if (!short_name && filename &&
|
||||
filename_number_test(filename) >= 0 &&
|
||||
guess_image_format(filename)) {
|
||||
@ -125,6 +130,26 @@ AVOutputFormat *guess_stream_format(const char *short_name, const char *filename
|
||||
return fmt;
|
||||
}
|
||||
|
||||
/**
|
||||
* guesses the codec id based upon muxer and filename.
|
||||
*/
|
||||
enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
|
||||
const char *filename, const char *mime_type, enum CodecType type){
|
||||
if(type == CODEC_TYPE_VIDEO){
|
||||
enum CodecID codec_id= CODEC_ID_NONE;
|
||||
|
||||
if(!strcmp(fmt->name, "image2")){
|
||||
codec_id= av_guess_image2_codec(filename);
|
||||
}
|
||||
if(codec_id == CODEC_ID_NONE)
|
||||
codec_id= fmt->video_codec;
|
||||
return codec_id;
|
||||
}else if(type == CODEC_TYPE_AUDIO)
|
||||
return fmt->audio_codec;
|
||||
else
|
||||
return CODEC_ID_NONE;
|
||||
}
|
||||
|
||||
AVInputFormat *av_find_input_format(const char *short_name)
|
||||
{
|
||||
AVInputFormat *fmt;
|
||||
@ -1740,6 +1765,11 @@ int av_find_stream_info(AVFormatContext *ic)
|
||||
st->codec.codec_id == CODEC_ID_VORBIS ||
|
||||
st->codec.codec_id == CODEC_ID_MJPEG ||
|
||||
st->codec.codec_id == CODEC_ID_PNG ||
|
||||
st->codec.codec_id == CODEC_ID_PAM ||
|
||||
st->codec.codec_id == CODEC_ID_PGM ||
|
||||
st->codec.codec_id == CODEC_ID_PGMYUV ||
|
||||
st->codec.codec_id == CODEC_ID_PBM ||
|
||||
st->codec.codec_id == CODEC_ID_PPM ||
|
||||
(st->codec.codec_id == CODEC_ID_MPEG4 && !st->need_parsing)))
|
||||
try_decode_frame(st, pkt->data, pkt->size);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user