colorspace = " C411 XYSCSS=411";
break;
case PIX_FMT_YUV420P:
- colorspace = (st->codec->codec_id == CODEC_ID_DVVIDEO)?" C420paldv XYSCSS=420PALDV":" C420mpeg2 XYSCSS=420MPEG2";
+ colorspace = (st->codec->chroma_sample_location == AVCHROMA_LOC_TOPLEFT)?" C420paldv XYSCSS=420PALDV":
+ (st->codec->chroma_sample_location == AVCHROMA_LOC_LEFT) ?" C420mpeg2 XYSCSS=420MPEG2":
+ " C420jpeg XYSCSS=420JPEG";
break;
case PIX_FMT_YUV422P:
colorspace = " C422 XYSCSS=422";
static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt)
{
AVStream *st = s->streams[pkt->stream_index];
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
AVPicture *picture;
int* first_pkt = s->priv_data;
int width, height, h_chroma_shift, v_chroma_shift;
av_log(s, AV_LOG_ERROR, "Error. YUV4MPEG stream header write failed.\n");
return AVERROR(EIO);
} else {
- put_buffer(pb, buf2, strlen(buf2));
+ avio_write(pb, buf2, strlen(buf2));
}
}
/* construct frame header */
m = snprintf(buf1, sizeof(buf1), "%s\n", Y4M_FRAME_MAGIC);
- put_buffer(pb, buf1, strlen(buf1));
+ avio_write(pb, buf1, strlen(buf1));
width = st->codec->width;
height = st->codec->height;
ptr = picture->data[0];
for(i=0;i<height;i++) {
- put_buffer(pb, ptr, width);
+ avio_write(pb, ptr, width);
ptr += picture->linesize[0];
}
ptr1 = picture->data[1];
ptr2 = picture->data[2];
for(i=0;i<height;i++) { /* Cb */
- put_buffer(pb, ptr1, width);
+ avio_write(pb, ptr1, width);
ptr1 += picture->linesize[1];
}
for(i=0;i<height;i++) { /* Cr */
- put_buffer(pb, ptr2, width);
+ avio_write(pb, ptr2, width);
ptr2 += picture->linesize[2];
}
}
return 0;
}
-AVOutputFormat yuv4mpegpipe_muxer = {
+AVOutputFormat ff_yuv4mpegpipe_muxer = {
"yuv4mpegpipe",
NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"),
"",
char header[MAX_YUV4_HEADER+10]; // Include headroom for the longest option
char *tokstart,*tokend,*header_end;
int i;
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
int width=-1, height=-1, raten=0, rated=0, aspectn=0, aspectd=0;
enum PixelFormat pix_fmt=PIX_FMT_NONE,alt_pix_fmt=PIX_FMT_NONE;
+ enum AVChromaLocation chroma_sample_location = AVCHROMA_LOC_UNSPECIFIED;
AVStream *st;
struct frame_attributes *s1 = s->priv_data;
for (i=0; i<MAX_YUV4_HEADER; i++) {
- header[i] = get_byte(pb);
+ header[i] = avio_r8(pb);
if (header[i] == '\n') {
header[i+1] = 0x20; // Add a space after last option. Makes parsing "444" vs "444alpha" easier.
header[i+2] = 0;
tokstart=tokend;
break;
case 'C': // Color space
- if (strncmp("420jpeg",tokstart,7)==0)
+ if (strncmp("420jpeg",tokstart,7)==0) {
pix_fmt = PIX_FMT_YUV420P;
- else if (strncmp("420mpeg2",tokstart,8)==0)
+ chroma_sample_location = AVCHROMA_LOC_CENTER;
+ } else if (strncmp("420mpeg2",tokstart,8)==0) {
pix_fmt = PIX_FMT_YUV420P;
- else if (strncmp("420paldv", tokstart, 8)==0)
+ chroma_sample_location = AVCHROMA_LOC_LEFT;
+ } else if (strncmp("420paldv", tokstart, 8)==0) {
pix_fmt = PIX_FMT_YUV420P;
- else if (strncmp("411", tokstart, 3)==0)
+ chroma_sample_location = AVCHROMA_LOC_TOPLEFT;
+ } else if (strncmp("411", tokstart, 3)==0)
pix_fmt = PIX_FMT_YUV411P;
else if (strncmp("422", tokstart, 3)==0)
pix_fmt = PIX_FMT_YUV422P;
pix_fmt = alt_pix_fmt;
}
- if (raten == 0 && rated == 0) {
+ if (raten <= 0 || rated <= 0) {
// Frame rate unknown
raten = 25;
rated = 1;
av_reduce(&raten, &rated, raten, rated, (1UL<<31)-1);
av_set_pts_info(st, 64, rated, raten);
st->codec->pix_fmt = pix_fmt;
- st->codec->codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_RAWVIDEO;
st->sample_aspect_ratio= (AVRational){aspectn, aspectd};
+ st->codec->chroma_sample_location = chroma_sample_location;
return 0;
}
struct frame_attributes *s1 = s->priv_data;
for (i=0; i<MAX_FRAME_HEADER; i++) {
- header[i] = get_byte(s->pb);
+ header[i] = avio_r8(s->pb);
if (header[i] == '\n') {
header[i+1] = 0;
break;
}
#if CONFIG_YUV4MPEGPIPE_DEMUXER
-AVInputFormat yuv4mpegpipe_demuxer = {
+AVInputFormat ff_yuv4mpegpipe_demuxer = {
"yuv4mpegpipe",
NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"),
sizeof(struct frame_attributes),