fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

st/va: refactored handleVASliceDataBufferType

Browse source 
This patch cleans the function handleVASliceDataBufferType() for better
readability.

Signed-off-by: Michael Varga <Michael.Varga@amd.com>
This commit is contained in:
Michael Varga 2014-10-17 11:05:59 -05:00 • committed by Leo Liu
parent 46a2323c3f
commit c24ee2cf43
1 changed files with 39 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/gallium/state_trackers/va/picture.c
View file

@ -272,51 +272,56 @@ handleSliceParameterBuffer(vlVaContext *context, vlVaBuffer *buf)
} }
} }
static unsigned int
bufHasStartcode(vlVaBuffer *buf, unsigned int code, unsigned int bits)
{
struct vl_vlc vlc = {0};
int i;
/* search the first 64 bytes for a startcode */
vl_vlc_init(&vlc, 1, (const void * const*)&buf->data, &buf->size);
for (i = 0; i < 64 && vl_vlc_bits_left(&vlc) >= bits; ++i) {
if (vl_vlc_peekbits(&vlc, bits) == code)
return 1;
vl_vlc_eatbits(&vlc, 8);
vl_vlc_fillbits(&vlc);
}
return 0;
}
static void static void
handleVASliceDataBufferType(vlVaContext *context, vlVaBuffer *buf) handleVASliceDataBufferType(vlVaContext *context, vlVaBuffer *buf)
{ {
enum pipe_video_format format;
unsigned num_buffers = 0; unsigned num_buffers = 0;
void * const *buffers[2]; void * const *buffers[2];
unsigned sizes[2]; unsigned sizes[2];
enum pipe_video_format format; static const uint8_t start_code_h264[] = { 0x00, 0x00, 0x01 };
static const uint8_t start_code_vc1[] = { 0x00, 0x00, 0x01, 0x0d };
format = u_reduce_video_profile(context->decoder->profile); format = u_reduce_video_profile(context->decoder->profile);
if (format == PIPE_VIDEO_FORMAT_MPEG4_AVC || switch (format) {
format == PIPE_VIDEO_FORMAT_VC1) { case PIPE_VIDEO_FORMAT_MPEG4_AVC:
struct vl_vlc vlc = {0}; if (bufHasStartcode(buf, 0x000001, 24))
bool found = false;
int peek_bits, i;
/* search the first 64 bytes for a startcode */
vl_vlc_init(&vlc, 1, (const void * const*)&buf->data, &buf->size);
peek_bits = (format == PIPE_VIDEO_FORMAT_MPEG4_AVC) ? 24 : 32;
for (i = 0; i < 64 && vl_vlc_bits_left(&vlc) >= peek_bits; ++i) {
uint32_t value = vl_vlc_peekbits(&vlc, peek_bits);
if ((format == PIPE_VIDEO_FORMAT_MPEG4_AVC && value == 0x000001) ||
(format == PIPE_VIDEO_FORMAT_VC1 && (value == 0x0000010d ||
value == 0x0000010c || value == 0x0000010b))) {
found = true;
break; break;
}
vl_vlc_eatbits(&vlc, 8);
vl_vlc_fillbits(&vlc);
}
/* none found, ok add one manually */
if (!found) {
static const uint8_t start_code_h264[] = { 0x00, 0x00, 0x01 };
static const uint8_t start_code_vc1[] = { 0x00, 0x00, 0x01, 0x0d };
if (format == PIPE_VIDEO_FORMAT_MPEG4_AVC) { buffers[num_buffers] = (void *const)&start_code_h264;
buffers[num_buffers] = (void *const)&start_code_h264; sizes[num_buffers++] = sizeof(start_code_h264);
sizes[num_buffers] = sizeof(start_code_h264); break;
} case PIPE_VIDEO_FORMAT_VC1:
else { if (bufHasStartcode(buf, 0x0000010d, 32) ||
buffers[num_buffers] = (void *const)&start_code_vc1; bufHasStartcode(buf, 0x0000010c, 32) ||
sizes[num_buffers] = sizeof(start_code_vc1); bufHasStartcode(buf, 0x0000010b, 32))
} break;
++num_buffers;
} buffers[num_buffers] = (void *const)&start_code_vc1;
sizes[num_buffers++] = sizeof(start_code_vc1);
break;
default:
break;
} }
buffers[num_buffers] = buf->data; buffers[num_buffers] = buf->data;
sizes[num_buffers] = buf->size; sizes[num_buffers] = buf->size;
++num_buffers; ++num_buffers;