mirror of
https://github.com/mpv-player/mpv
synced 2024-12-22 06:42:03 +00:00
revert useless uyvy planar->packed converter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14014 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
c27c550353
commit
03301bcf6f
@ -3,7 +3,7 @@ LIBNAME = libmpeg2.a
|
||||
|
||||
include ../config.mak
|
||||
|
||||
SRCS = alloc.c cpu_accel.c cpu_state.c decode.c header.c idct.c motion_comp.c slice.c uyvy.c
|
||||
SRCS = alloc.c cpu_accel.c cpu_state.c decode.c header.c idct.c motion_comp.c slice.c
|
||||
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
INCLUDE = -I. -I../libvo -I.. $(EXTRA_INC)
|
||||
|
127
libmpeg2/uyvy.c
127
libmpeg2/uyvy.c
@ -1,127 +0,0 @@
|
||||
/*
|
||||
* uyvy.c
|
||||
* Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org>
|
||||
* Copyright (C) 2003 Regis Duchesne <hpreg@zoy.org>
|
||||
* Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
|
||||
*
|
||||
* This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
|
||||
* See http://libmpeg2.sourceforge.net/ for updates.
|
||||
*
|
||||
* mpeg2dec is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* mpeg2dec 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 General Public License for more details.
|
||||
*
|
||||
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <inttypes.h>
|
||||
|
||||
#include "mpeg2.h"
|
||||
//#include "mpeg2convert.h"
|
||||
|
||||
typedef struct {
|
||||
int width;
|
||||
int stride;
|
||||
int chroma420;
|
||||
uint8_t * out;
|
||||
} convert_uyvy_t;
|
||||
|
||||
static void uyvy_start (void * _id, const mpeg2_fbuf_t * fbuf,
|
||||
const mpeg2_picture_t * picture,
|
||||
const mpeg2_gop_t * gop)
|
||||
{
|
||||
convert_uyvy_t * instance = (convert_uyvy_t *) _id;
|
||||
|
||||
instance->out = fbuf->buf[0];
|
||||
instance->stride = instance->width;
|
||||
if (picture->nb_fields == 1) {
|
||||
if (! (picture->flags & PIC_FLAG_TOP_FIELD_FIRST))
|
||||
instance->out += 2 * instance->stride;
|
||||
instance->stride <<= 1;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
#define PACK(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
|
||||
#else
|
||||
#define PACK(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a))
|
||||
#endif
|
||||
|
||||
static void uyvy_line (uint8_t * py, uint8_t * pu, uint8_t * pv, void * _dst,
|
||||
int width)
|
||||
{
|
||||
uint32_t * dst = (uint32_t *) _dst;
|
||||
|
||||
width >>= 4;
|
||||
do {
|
||||
dst[0] = PACK (pu[0], py[0], pv[0], py[1]);
|
||||
dst[1] = PACK (pu[1], py[2], pv[1], py[3]);
|
||||
dst[2] = PACK (pu[2], py[4], pv[2], py[5]);
|
||||
dst[3] = PACK (pu[3], py[6], pv[3], py[7]);
|
||||
dst[4] = PACK (pu[4], py[8], pv[4], py[9]);
|
||||
dst[5] = PACK (pu[5], py[10], pv[5], py[11]);
|
||||
dst[6] = PACK (pu[6], py[12], pv[6], py[13]);
|
||||
dst[7] = PACK (pu[7], py[14], pv[7], py[15]);
|
||||
py += 16;
|
||||
pu += 8;
|
||||
pv += 8;
|
||||
dst += 8;
|
||||
} while (--width);
|
||||
}
|
||||
|
||||
static void uyvy_copy (void * id, uint8_t * const * src, unsigned int v_offset)
|
||||
{
|
||||
const convert_uyvy_t * instance = (convert_uyvy_t *) id;
|
||||
uint8_t * py;
|
||||
uint8_t * pu;
|
||||
uint8_t * pv;
|
||||
uint8_t * dst;
|
||||
int height;
|
||||
|
||||
dst = instance->out + 2 * instance->stride * v_offset;
|
||||
py = src[0]; pu = src[1]; pv = src[2];
|
||||
|
||||
height = 16;
|
||||
do {
|
||||
uyvy_line (py, pu, pv, dst, instance->width);
|
||||
dst += 2 * instance->stride;
|
||||
py += instance->stride;
|
||||
if (! (--height & instance->chroma420)) {
|
||||
pu += instance->stride >> 1;
|
||||
pv += instance->stride >> 1;
|
||||
}
|
||||
} while (height);
|
||||
}
|
||||
|
||||
int mpeg2convert_uyvy (int stage, void * _id, const mpeg2_sequence_t * seq,
|
||||
int stride, uint32_t accel, void * arg,
|
||||
mpeg2_convert_init_t * result)
|
||||
{
|
||||
convert_uyvy_t * instance = (convert_uyvy_t *) _id;
|
||||
|
||||
if (seq->chroma_width == seq->width)
|
||||
return 1;
|
||||
|
||||
if (instance) {
|
||||
instance->width = seq->width;
|
||||
instance->chroma420 = (seq->chroma_height < seq->height);
|
||||
result->buf_size[0] = seq->width * seq->height * 2;
|
||||
result->buf_size[1] = result->buf_size[2] = 0;
|
||||
result->start = uyvy_start;
|
||||
result->copy = uyvy_copy;
|
||||
} else {
|
||||
result->id_size = sizeof (convert_uyvy_t);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue
Block a user