Skip to content
This repository was archived by the owner on Jan 31, 2025. It is now read-only.

Commit aeaa2a1

Browse files
committed
jpeg: drop explicit check for VA/JPEG decoding API.
Staging branch VA driver needs to be built against a staging branch libva. So, the VA/JPEG decoding API is present and actually mandatory for VA-API >= 0.34.
1 parent 716a77b commit aeaa2a1

File tree

3 files changed

+0
-34
lines changed

3 files changed

+0
-34
lines changed

configure.ac

-23
Original file line numberDiff line numberDiff line change
@@ -90,29 +90,6 @@ fi
9090
AC_MSG_RESULT([$LIBVA_DRIVERS_PATH])
9191
AC_SUBST(LIBVA_DRIVERS_PATH)
9292

93-
dnl Check for JPEG decoding API
94-
AC_CACHE_CHECK([for JPEG decoding API], ac_cv_have_jpeg_decoding_api, [
95-
saved_CFLAGS="$CFLAGS"
96-
CFLAGS="$CFLAGS $LIBVA_DEPS_CFLAGS"
97-
saved_LIBS="$LIBS"
98-
LIBS="$CFLAGS $LIBVA_DEPS_LIBS"
99-
AC_TRY_COMPILE(
100-
[#include <va/va.h>
101-
#include <va/va_dec_jpeg.h>],
102-
[VAPictureParameterBufferJPEG pic_param;
103-
VASliceParameterBufferJPEG slice_param;
104-
VAIQMatrixParameterBufferJPEG iq_matrix;],
105-
[ac_cv_have_jpeg_decoding_api="yes"],
106-
[ac_cv_have_jpeg_decoding_api="no"]
107-
)
108-
CFLAGS="$saved_CFLAGS"
109-
LIBS="$saved_LIBS"
110-
])
111-
if test "$ac_cv_have_jpeg_decoding_api" = "yes"; then
112-
AC_DEFINE(HAVE_JPEG_DECODING, 1,
113-
[Defined to 1 if VA-API exposes JPEG decoding])
114-
fi
115-
11693
AC_OUTPUT([
11794
Makefile
11895
debian.upstream/Makefile

src/gen7_mfd.c

-7
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
*
2727
*/
2828

29-
#ifdef HAVE_CONFIG_H
30-
# include "config.h"
31-
#endif
3229
#include <stdio.h>
3330
#include <stdlib.h>
3431
#include <string.h>
@@ -1944,7 +1941,6 @@ gen7_mfd_vc1_decode_picture(VADriverContextP ctx,
19441941
intel_batchbuffer_flush(batch);
19451942
}
19461943

1947-
#ifdef HAVE_JPEG_DECODING
19481944
static void
19491945
gen7_mfd_jpeg_decode_init(VADriverContextP ctx,
19501946
struct decode_state *decode_state,
@@ -2728,7 +2724,6 @@ gen7_mfd_jpeg_decode_picture(VADriverContextP ctx,
27282724
intel_batchbuffer_end_atomic(batch);
27292725
intel_batchbuffer_flush(batch);
27302726
}
2731-
#endif
27322727

27332728
static void
27342729
gen7_mfd_decode_picture(VADriverContextP ctx,
@@ -2762,11 +2757,9 @@ gen7_mfd_decode_picture(VADriverContextP ctx,
27622757
gen7_mfd_vc1_decode_picture(ctx, decode_state, gen7_mfd_context);
27632758
break;
27642759

2765-
#ifdef HAVE_JPEG_DECODING
27662760
case VAProfileJPEGBaseline:
27672761
gen7_mfd_jpeg_decode_picture(ctx, decode_state, gen7_mfd_context);
27682762
break;
2769-
#endif
27702763

27712764
default:
27722765
assert(0);

src/i965_drv_video.c

-4
Original file line numberDiff line numberDiff line change
@@ -1141,9 +1141,7 @@ i965_create_buffer_internal(VADriverContextP ctx,
11411141
case VAEncMiscParameterBufferType:
11421142
case VAProcPipelineParameterBufferType:
11431143
case VAProcFilterParameterBufferType:
1144-
#ifdef HAVE_JPEG_DECODING
11451144
case VAHuffmanTableBufferType:
1146-
#endif
11471145
/* Ok */
11481146
break;
11491147

@@ -1540,11 +1538,9 @@ i965_decoder_render_picture(VADriverContextP ctx,
15401538
vaStatus = I965_RENDER_DECODE_BUFFER(slice_data);
15411539
break;
15421540

1543-
#ifdef HAVE_JPEG_DECODING
15441541
case VAHuffmanTableBufferType:
15451542
vaStatus = I965_RENDER_DECODE_BUFFER(huffman_table);
15461543
break;
1547-
#endif
15481544

15491545
default:
15501546
vaStatus = VA_STATUS_ERROR_UNSUPPORTED_BUFFERTYPE;

0 commit comments

Comments
 (0)