mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

codecparsers: vp9: fix macro namespacing and rename GstVp9InterpFilter

Browse source
This commit is contained in:
Tim-Philipp Müller 2015-12-30 13:12:13 +00:00
parent 75b31d1872
commit d6834432ed
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst-libs/gst/codecparsers/gstvp9parser.c
View file

@ -206,17 +206,17 @@ parse_frame_size_from_refs (const GstVp9Parser * parser,
parse_frame_size (br, &frame_hdr->width, &frame_hdr->height); parse_frame_size (br, &frame_hdr->width, &frame_hdr->height);
} }
static GstVp9InterpFilter static GstVp9InterpolationFilter
parse_interp_filter (GstBitReader * br) parse_interp_filter (GstBitReader * br)
{ {
const GstVp9InterpFilter filter_map[] = { static const GstVp9InterpolationFilter filter_map[] = {
GST_VP9_INTERP_FILTER_EIGHTTAP_SMOOTH, GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH,
GST_VP9_INTERP_FILTER_EIGHTTAP, GST_VP9_INTERPOLATION_FILTER_EIGHTTAP,
GST_VP9_INTERP_FILTER_EIGHTTAP_SHARP, GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SHARP,
GST_VP9_INTERP_FILTER_BILINEAR GST_VP9_INTERPOLATION_FILTER_BILINEAR
}; };
return gst_vp9_read_bit (br) ? GST_VP9_INTERP_FILTER_SWITCHABLE : return gst_vp9_read_bit (br) ? GST_VP9_INTERPOLATION_FILTER_SWITCHABLE :
filter_map[gst_vp9_read_bits (br, 2)]; filter_map[gst_vp9_read_bits (br, 2)];
} }
@ -781,7 +781,7 @@ gst_vp9_parser_parse_frame_header (GstVp9Parser * parser,
frame_hdr->frame_parallel_decoding_mode = frame_hdr->frame_parallel_decoding_mode =
frame_hdr->error_resilient_mode ? 1 : gst_vp9_read_bit (br); frame_hdr->error_resilient_mode ? 1 : gst_vp9_read_bit (br);
frame_hdr->frame_context_idx = frame_hdr->frame_context_idx =
gst_vp9_read_bits (br, GST_FRAME_CONTEXTS_LOG2); gst_vp9_read_bits (br, GST_VP9_FRAME_CONTEXTS_LOG2);
/* loopfilter header */ /* loopfilter header */
parse_loopfilter (&frame_hdr->loopfilter, br); parse_loopfilter (&frame_hdr->loopfilter, br);

26
gst-libs/gst/codecparsers/gstvp9parser.h
View file

@ -44,7 +44,7 @@ G_BEGIN_DECLS
#define GST_VP9_REF_FRAMES_LOG2 3 #define GST_VP9_REF_FRAMES_LOG2 3
#define GST_VP9_REF_FRAMES (1 << GST_VP9_REF_FRAMES_LOG2) #define GST_VP9_REF_FRAMES (1 << GST_VP9_REF_FRAMES_LOG2)
#define GST_FRAME_CONTEXTS_LOG2 2 #define GST_VP9_FRAME_CONTEXTS_LOG2 2
#define GST_VP9_MAX_LOOP_FILTER 63 #define GST_VP9_MAX_LOOP_FILTER 63
#define GST_VP9_MAX_SHARPNESS 7 #define GST_VP9_MAX_SHARPNESS 7
@ -176,24 +176,24 @@ typedef enum {
} GstVp9ColorRange; } GstVp9ColorRange;
/** /**
* GstVp9InterpFilter: * GstVp9InterpolationFilter:
* @GST_VP9_INTERP_FILTER_EIGHTTAP: EightTap interpolation filter * @GST_VP9_INTERPOLATION_FILTER_EIGHTTAP: EightTap interpolation filter
* @GST_VP9_INTERP_FILTER_EIGHTTAP_SMOOTH: Smooth interpolation filter * @GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH: Smooth interpolation filter
* @GST_VP9_INTERP_FILTER_EIGHTTAP_SHARP: Shart interpolation filter * @GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SHARP: Shart interpolation filter
* @GST_VP9_INTERP_FILTER_BILINEAR: Bilinear interpolation filter * @GST_VP9_INTERPOLATION_FILTER_BILINEAR: Bilinear interpolation filter
* @GST_VP9_INTERP_FILTER_SWITCHABLE: Selectable interpolation filter * @GST_VP9_INTERPOLATION_FILTER_SWITCHABLE: Selectable interpolation filter
* *
* Interpolation Filters Types * Interpolation Filters Types
* *
* Since: 1.8 * Since: 1.8
*/ */
typedef enum { typedef enum {
GST_VP9_INTERP_FILTER_EIGHTTAP = 0, GST_VP9_INTERPOLATION_FILTER_EIGHTTAP = 0,
GST_VP9_INTERP_FILTER_EIGHTTAP_SMOOTH = 1, GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH = 1,
GST_VP9_INTERP_FILTER_EIGHTTAP_SHARP = 2, GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SHARP = 2,
GST_VP9_INTERP_FILTER_BILINEAR = 3, GST_VP9_INTERPOLATION_FILTER_BILINEAR = 3,
GST_VP9_INTERP_FILTER_SWITCHABLE = 4 GST_VP9_INTERPOLATION_FILTER_SWITCHABLE = 4
} GstVp9InterpFilter; } GstVp9InterpolationFilter;
/** /**
* GstVp9RefFrameType: * GstVp9RefFrameType: