break;
case PIX_FMT_RGBA32:
bpp = depth = 32;
- endianness = G_BIG_ENDIAN;
- r_mask = 0x00ff0000; g_mask = 0x0000ff00; b_mask = 0x000000ff;
- break;
- case PIX_FMT_BGRA32:
- bpp = depth = 32;
- endianness = G_BIG_ENDIAN;
+ endianness = G_BYTE_ORDER;
r_mask = 0x00ff0000; g_mask = 0x0000ff00; b_mask = 0x000000ff;
break;
case PIX_FMT_YUV410P:
break;
case PIX_FMT_RGB565:
bpp = depth = 16;
- endianness = G_BIG_ENDIAN;
+ endianness = G_BYTE_ORDER;
r_mask = 0xf800; g_mask = 0x07e0; b_mask = 0x001f;
break;
case PIX_FMT_RGB555:
bpp = 16; depth = 15;
- endianness = G_BIG_ENDIAN;
- r_mask = 0x7c00; g_mask = 0x03e0; b_mask = 0x001f;
- break;
- case PIX_FMT_BGR565:
- bpp = depth = 16;
- endianness = G_LITTLE_ENDIAN;
- r_mask = 0xf800; g_mask = 0x07e0; b_mask = 0x001f;
- break;
- case PIX_FMT_BGR555:
- bpp = 16; depth = 16;
- endianness = G_LITTLE_ENDIAN;
+ endianness = G_BYTE_ORDER;
r_mask = 0x7c00; g_mask = 0x03e0; b_mask = 0x001f;
break;
default:
gst_caps_get_int(caps, "depth", &depth);
switch (depth) {
case 15:
- if (endianness == G_BIG_ENDIAN) {
- context->pix_fmt = PIX_FMT_RGB555;
- } else {
- context->pix_fmt = PIX_FMT_BGR555;
- }
+ context->pix_fmt = PIX_FMT_RGB555;
break;
case 16:
- if (endianness == G_BIG_ENDIAN) {
- context->pix_fmt = PIX_FMT_RGB565;
- } else {
- context->pix_fmt = PIX_FMT_BGR565;
- }
+ context->pix_fmt = PIX_FMT_RGB565;
break;
case 24:
if (endianness == G_BIG_ENDIAN) {
}
break;
case 32:
- if (endianness == G_BIG_ENDIAN) {
- context->pix_fmt = PIX_FMT_RGBA32;
- } else {
- context->pix_fmt = PIX_FMT_BGRA32;
- }
+ context->pix_fmt = PIX_FMT_RGBA32;
break;
}
break;
return GST_CAPS_NEW ("ffmpeg_mpeg4",
"video/avi",
"format", GST_PROPS_STRING ("strf_vids"),
- "compression", GST_PROPS_FOURCC (context->fourcc),
+ "compression", GST_PROPS_FOURCC (context->codec_tag),
"width", GST_PROPS_INT (context->width),
"height", GST_PROPS_INT (context->height)
);
ffmpegenc->context->qmax = 15;
ffmpegenc->context->max_qdiff = 3;
ffmpegenc->context->gop_size = 15;
- ffmpegenc->context->frame_rate = 25 * FRAME_RATE_BASE;
+ ffmpegenc->context->frame_rate = 25 * DEFAULT_FRAME_RATE_BASE;
+ ffmpegenc->context->frame_rate_base = DEFAULT_FRAME_RATE_BASE;
ffmpegenc->out_width = -1;
ffmpegenc->out_height = -1;
}
gst_caps_get_int (caps, "height", &ffmpegmux->context->height);
ffmpegmux->context->pix_fmt = PIX_FMT_YUV420P;
- ffmpegmux->context->frame_rate = 23 * FRAME_RATE_BASE;
+ ffmpegmux->context->frame_rate = 23 * DEFAULT_FRAME_RATE_BASE;
+ ffmpegmux->context->frame_rate_base = DEFAULT_FRAME_RATE_BASE;
ffmpegmux->context->bit_rate = 0;
/* FIXME bug in ffmpeg */