summaryrefslogtreecommitdiff
path: root/src/libffmpeg
diff options
context:
space:
mode:
Diffstat (limited to 'src/libffmpeg')
-rw-r--r--src/libffmpeg/ff_audio_decoder.c3
-rw-r--r--src/libffmpeg/ff_dvaudio_decoder.c3
-rw-r--r--src/libffmpeg/ff_mpeg_parser.c2
-rw-r--r--src/libffmpeg/ff_mpeg_parser.h2
-rw-r--r--src/libffmpeg/ff_video_decoder.c60
-rw-r--r--src/libffmpeg/ffmpeg_decoder.c3
-rw-r--r--src/libffmpeg/ffmpeg_decoder.h3
-rw-r--r--src/libffmpeg/ffmpeg_encoder.c2
8 files changed, 28 insertions, 50 deletions
diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c
index e125e6e39..b9762c66b 100644
--- a/src/libffmpeg/ff_audio_decoder.c
+++ b/src/libffmpeg/ff_audio_decoder.c
@@ -17,10 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
- * $Id: audio_decoder.c,v 1.33 2007/01/28 18:38:33 miguelfreitas Exp $
- *
* xine audio decoder plugin using ffmpeg
- *
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c
index 85f4a4842..08ddf4e30 100644
--- a/src/libffmpeg/ff_dvaudio_decoder.c
+++ b/src/libffmpeg/ff_dvaudio_decoder.c
@@ -17,10 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
- * $Id: dvaudio_decoder.c,v 1.11 2006/07/10 22:08:29 dgp85 Exp $
- *
* dv audio decoder based on patch by Dan Dennedy <dan@dennedy.org>
- *
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/libffmpeg/ff_mpeg_parser.c b/src/libffmpeg/ff_mpeg_parser.c
index 795dee646..70901d93b 100644
--- a/src/libffmpeg/ff_mpeg_parser.c
+++ b/src/libffmpeg/ff_mpeg_parser.c
@@ -19,8 +19,6 @@
*
* Simple MPEG-ES parser/framer by Thibaut Mattern (tmattern@noos.fr)
* based on libmpeg2 decoder.
- *
- * $Id: mpeg_parser.c,v 1.7 2007/03/29 18:52:45 dgp85 Exp $
*/
#define LOG_MODULE "mpeg_parser"
#define LOG_VERBOSE
diff --git a/src/libffmpeg/ff_mpeg_parser.h b/src/libffmpeg/ff_mpeg_parser.h
index 8644b2379..ea43a6ce4 100644
--- a/src/libffmpeg/ff_mpeg_parser.h
+++ b/src/libffmpeg/ff_mpeg_parser.h
@@ -19,8 +19,6 @@
*
* Simple MPEG-ES parser/framer by Thibaut Mattern (tmattern@noos.fr)
* based on libmpeg2 decoder.
- *
- * $Id: mpeg_parser.h,v 1.5 2007/03/29 18:52:45 dgp85 Exp $
*/
#ifndef HAVE_MPEG_PARSER_H
#define HAVE_MPEG_PARSER_H
diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c
index e823b392c..a941481ae 100644
--- a/src/libffmpeg/ff_video_decoder.c
+++ b/src/libffmpeg/ff_video_decoder.c
@@ -17,10 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
- * $Id: video_decoder.c,v 1.73 2007/03/29 18:41:02 dgp85 Exp $
- *
* xine video decoder plugin using ffmpeg
- *
*/
#ifdef HAVE_CONFIG_H
@@ -86,6 +83,7 @@ struct ff_video_decoder_s {
uint8_t yuv_init:1;
uint8_t is_direct_rendering_disabled:1;
uint8_t cs_convert_init:1;
+ uint8_t assume_bad_field_picture:1;
xine_bmiheader bih;
unsigned char *buf;
@@ -423,6 +421,9 @@ static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type)
case BUF_VIDEO_HUFFYUV:
this->frame_flags |= VO_INTERLACED_FLAG;
break;
+ case BUF_VIDEO_H264:
+ this->frame_flags |= VO_INTERLACED_FLAG;
+ break;
}
}
@@ -1155,7 +1156,6 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
int offset = 0;
int codec_type = buf->type & 0xFFFF0000;
int video_step_to_use;
- int frame_flags_to_use;
/* pad input data */
/* note: bitstream, alt bitstream reader or something will cause
@@ -1199,12 +1199,6 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
/* use externally provided video_step or fall back to stream's time_base otherwise */
video_step_to_use = (this->video_step || !this->context->time_base.den) ? this->video_step : (int)(90000ll * this->context->time_base.num / this->context->time_base.den);
- frame_flags_to_use = this->frame_flags;
-
- /* adjust frame flags for interlaced frames when running in demux_mpeg_pes context */
- if (!this->video_step && this->av_frame->interlaced_frame)
- frame_flags_to_use |= VO_INTERLACED_FLAG;
-
/* aspect ratio provided by ffmpeg, override previous setting */
if ((this->aspect_ratio_prio < 2) &&
av_cmp_q(this->context->sample_aspect_ratio, avr00)) {
@@ -1249,12 +1243,13 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
set_stream_info(this);
}
+ /* xine-lib expects the framesize to be a multiple of 16x16 (macroblock) */
img = this->stream->video_out->get_frame (this->stream->video_out,
- this->bih.biWidth,
- (this->bih.biHeight + 31) & ~31,
+ (this->bih.biWidth + 15) & ~15,
+ (this->bih.biHeight + 15) & ~15,
this->aspect_ratio,
this->output_format,
- VO_BOTH_FIELDS|frame_flags_to_use);
+ VO_BOTH_FIELDS|this->frame_flags);
free_img = 1;
} else {
/* DR1 */
@@ -1271,11 +1266,11 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
if(this->av_frame->opaque) {
/* DR1 */
img = this->stream->video_out->get_frame (this->stream->video_out,
- img->width,
- (img->height + 31) & ~31,
+ (img->width + 15) & ~15,
+ (img->height + 15) & ~15,
this->aspect_ratio,
this->output_format,
- VO_BOTH_FIELDS|frame_flags_to_use);
+ VO_BOTH_FIELDS|this->frame_flags);
free_img = 1;
}
@@ -1305,14 +1300,13 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
else
img->duration = video_step_to_use;
- img->crop_right = this->crop_right;
+ /* additionally crop away the extra pixels due to adjusting frame size above */
+ img->crop_right = this->crop_right + (img->width - this->bih.biWidth);
img->crop_bottom = this->crop_bottom + (img->height - this->bih.biHeight);
- /* transfer some more frame settings when running in demux_mpeg_pes context */
- if (!this->video_step) {
- img->progressive_frame = !this->av_frame->interlaced_frame;
- img->top_field_first = this->av_frame->top_field_first;
- }
+ /* transfer some more frame settings for deinterlacing */
+ img->progressive_frame = !this->av_frame->interlaced_frame;
+ img->top_field_first = this->av_frame->top_field_first;
this->skipframes = img->draw(img, this->stream);
@@ -1324,28 +1318,30 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
/* workaround for demux_mpeg_pes sending fields as frames:
* do not generate a bad frame for the first field picture
*/
- if (!got_one_picture && (this->size || this->video_step || !this->av_frame->interlaced_frame)) {
- /* skipped frame, output a bad frame (of size 1x1 when size still uninitialized) */
+ if (!got_one_picture && (this->size || this->video_step || this->assume_bad_field_picture)) {
+ /* skipped frame, output a bad frame (use size 16x16, when size still uninitialized) */
img = this->stream->video_out->get_frame (this->stream->video_out,
- (this->bih.biWidth <= 0) ? 16 : this->bih.biWidth,
- (this->bih.biHeight <= 0) ? 32 : this->bih.biHeight,
+ (this->bih.biWidth <= 0) ? 16 : ((this->bih.biWidth + 15) & ~15),
+ (this->bih.biHeight <= 0) ? 16 : ((this->bih.biHeight + 15) & ~15),
this->aspect_ratio,
this->output_format,
- VO_BOTH_FIELDS|frame_flags_to_use);
+ VO_BOTH_FIELDS|this->frame_flags);
/* set PTS to allow early syncing */
img->pts = this->pts;
this->pts = 0;
img->duration = video_step_to_use;
- /* transfer some more frame settings when running in demux_mpeg_pes context */
- if (!this->video_step) {
- img->progressive_frame = !this->av_frame->interlaced_frame;
- img->top_field_first = this->av_frame->top_field_first;
- }
+
+ /* additionally crop away the extra pixels due to adjusting frame size above */
+ img->crop_right = ((this->bih.biWidth <= 0) ? 0 : this->crop_right) + (img->width - this->bih.biWidth);
+ img->crop_bottom = ((this->bih.biHeight <= 0) ? 0 : this->crop_bottom) + (img->height - this->bih.biHeight);
+
img->bad_frame = 1;
this->skipframes = img->draw(img, this->stream);
img->free(img);
}
+
+ this->assume_bad_field_picture = !got_one_picture;
}
}
diff --git a/src/libffmpeg/ffmpeg_decoder.c b/src/libffmpeg/ffmpeg_decoder.c
index 86cae1c32..c0fb90e97 100644
--- a/src/libffmpeg/ffmpeg_decoder.c
+++ b/src/libffmpeg/ffmpeg_decoder.c
@@ -17,10 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
- * $Id: xine_decoder.c,v 1.173 2007/01/13 21:19:52 miguelfreitas Exp $
- *
* xine decoder plugin using ffmpeg
- *
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/libffmpeg/ffmpeg_decoder.h b/src/libffmpeg/ffmpeg_decoder.h
index bc3ff3e9e..bfe71a6b1 100644
--- a/src/libffmpeg/ffmpeg_decoder.h
+++ b/src/libffmpeg/ffmpeg_decoder.h
@@ -16,9 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * $Id: xine_decoder.h,v 1.7.2.1 2006/12/02 01:20:07 dgp85 Exp $
- *
*/
#ifndef HAVE_XINE_DECODER_H
diff --git a/src/libffmpeg/ffmpeg_encoder.c b/src/libffmpeg/ffmpeg_encoder.c
index 9e9800c1d..d9c4ccf5d 100644
--- a/src/libffmpeg/ffmpeg_encoder.c
+++ b/src/libffmpeg/ffmpeg_encoder.c
@@ -16,8 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * $Id: xine_encoder.c,v 1.25 2006/07/10 22:08:29 dgp85 Exp $
*/
/* mpeg encoders for the dxr3 video out plugin. */
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 05:45:56 +0000