From 5afe774f403fabb4903bbb8738124e6666de2ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tadas=20Barzd=C5=BEius?= Date: Mon, 10 Jul 2017 12:35:49 +0300 Subject: [PATCH] crate: update bitflags --- Cargo.toml | 2 +- src/codec/capabilities.rs | 34 +++++----- src/codec/debug.rs | 38 +++++------ src/codec/decoder/check.rs | 18 ++--- src/codec/decoder/conceal.rs | 8 +-- src/codec/decoder/slice.rs | 8 +-- src/codec/flag.rs | 38 +++++------ src/codec/packet/flag.rs | 6 +- src/codec/subtitle/flag.rs | 4 +- src/filter/flag.rs | 14 ++-- src/format/format/flag.rs | 38 +++++------ src/format/stream/disposition.rs | 30 ++++----- src/software/resampling/flag.rs | 4 +- src/software/scaling/flag.rs | 44 ++++++------- src/util/channel_layout.rs | 110 +++++++++++++++---------------- src/util/frame/flag.rs | 4 +- 16 files changed, 200 insertions(+), 200 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 701bfb6..6023429 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -88,7 +88,7 @@ software-scaling = ["ffmpeg-sys/swscale", "codec"] [dependencies] libc = "0.2" -bitflags = "0.8" +bitflags = "0.9" [dependencies.image] version = "0.12" diff --git a/src/codec/capabilities.rs b/src/codec/capabilities.rs index 1e13063..dfa47ea 100644 --- a/src/codec/capabilities.rs +++ b/src/codec/capabilities.rs @@ -2,22 +2,22 @@ use libc::c_uint; use ffi::*; bitflags! { - pub flags Capabilities: c_uint { - const DRAW_HORIZ_BAND = AV_CODEC_CAP_DRAW_HORIZ_BAND, - const DR1 = AV_CODEC_CAP_DR1, - const TRUNCATED = AV_CODEC_CAP_TRUNCATED, - const DELAY = AV_CODEC_CAP_DELAY, - const SMALL_LAST_FRAME = AV_CODEC_CAP_SMALL_LAST_FRAME, - const HWACCEL_VDPAU = AV_CODEC_CAP_HWACCEL_VDPAU, - const SUBFRAMES = AV_CODEC_CAP_SUBFRAMES, - const EXPERIMENTAL = AV_CODEC_CAP_EXPERIMENTAL, - const CHANNEL_CONF = AV_CODEC_CAP_CHANNEL_CONF, - const FRAME_THREADS = AV_CODEC_CAP_FRAME_THREADS, - const SLICE_THREADS = AV_CODEC_CAP_SLICE_THREADS, - const PARAM_CHANGE = AV_CODEC_CAP_PARAM_CHANGE, - const AUTO_THREADS = AV_CODEC_CAP_AUTO_THREADS, - const VARIABLE_FRAME_SIZE = AV_CODEC_CAP_VARIABLE_FRAME_SIZE, - const INTRA_ONLY = AV_CODEC_CAP_INTRA_ONLY, - const LOSSLESS = AV_CODEC_CAP_LOSSLESS, + pub struct Capabilities: c_uint { + const DRAW_HORIZ_BAND = AV_CODEC_CAP_DRAW_HORIZ_BAND; + const DR1 = AV_CODEC_CAP_DR1; + const TRUNCATED = AV_CODEC_CAP_TRUNCATED; + const DELAY = AV_CODEC_CAP_DELAY; + const SMALL_LAST_FRAME = AV_CODEC_CAP_SMALL_LAST_FRAME; + const HWACCEL_VDPAU = AV_CODEC_CAP_HWACCEL_VDPAU; + const SUBFRAMES = AV_CODEC_CAP_SUBFRAMES; + const EXPERIMENTAL = AV_CODEC_CAP_EXPERIMENTAL; + const CHANNEL_CONF = AV_CODEC_CAP_CHANNEL_CONF; + const FRAME_THREADS = AV_CODEC_CAP_FRAME_THREADS; + const SLICE_THREADS = AV_CODEC_CAP_SLICE_THREADS; + const PARAM_CHANGE = AV_CODEC_CAP_PARAM_CHANGE; + const AUTO_THREADS = AV_CODEC_CAP_AUTO_THREADS; + const VARIABLE_FRAME_SIZE = AV_CODEC_CAP_VARIABLE_FRAME_SIZE; + const INTRA_ONLY = AV_CODEC_CAP_INTRA_ONLY; + const LOSSLESS = AV_CODEC_CAP_LOSSLESS; } } diff --git a/src/codec/debug.rs b/src/codec/debug.rs index 1cceb55..c5cf935 100644 --- a/src/codec/debug.rs +++ b/src/codec/debug.rs @@ -2,24 +2,24 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Debug: c_int { - const PICT_INFO = FF_DEBUG_PICT_INFO, - const RC = FF_DEBUG_RC, - const BITSTREAM = FF_DEBUG_BITSTREAM, - const MB_TYPE = FF_DEBUG_MB_TYPE, - const QP = FF_DEBUG_QP, - const MV = FF_DEBUG_MV, - const DCT_COEFF = FF_DEBUG_DCT_COEFF, - const SKIP = FF_DEBUG_SKIP, - const STARTCODE = FF_DEBUG_STARTCODE, - const PTS = FF_DEBUG_PTS, - const ER = FF_DEBUG_ER, - const MMCO = FF_DEBUG_MMCO, - const BUGS = FF_DEBUG_BUGS, - const VIS_QP = FF_DEBUG_VIS_QP, - const VIS_MB_TYPE = FF_DEBUG_VIS_MB_TYPE, - const BUFFERS = FF_DEBUG_BUFFERS, - const THREADS = FF_DEBUG_THREADS, - const NOMC = FF_DEBUG_NOMC, + pub struct Debug: c_int { + const PICT_INFO = FF_DEBUG_PICT_INFO; + const RC = FF_DEBUG_RC; + const BITSTREAM = FF_DEBUG_BITSTREAM; + const MB_TYPE = FF_DEBUG_MB_TYPE; + const QP = FF_DEBUG_QP; + const MV = FF_DEBUG_MV; + const DCT_COEFF = FF_DEBUG_DCT_COEFF; + const SKIP = FF_DEBUG_SKIP; + const STARTCODE = FF_DEBUG_STARTCODE; + const PTS = FF_DEBUG_PTS; + const ER = FF_DEBUG_ER; + const MMCO = FF_DEBUG_MMCO; + const BUGS = FF_DEBUG_BUGS; + const VIS_QP = FF_DEBUG_VIS_QP; + const VIS_MB_TYPE = FF_DEBUG_VIS_MB_TYPE; + const BUFFERS = FF_DEBUG_BUFFERS; + const THREADS = FF_DEBUG_THREADS; + const NOMC = FF_DEBUG_NOMC; } } diff --git a/src/codec/decoder/check.rs b/src/codec/decoder/check.rs index e75a369..3a89068 100644 --- a/src/codec/decoder/check.rs +++ b/src/codec/decoder/check.rs @@ -2,15 +2,15 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Check: c_int { - const CRC = AV_EF_CRCCHECK, - const BISTREAM = AV_EF_BITSTREAM, - const BUFFER = AV_EF_BUFFER, - const EXPLODE = AV_EF_EXPLODE, + pub struct Check: c_int { + const CRC = AV_EF_CRCCHECK; + const BISTREAM = AV_EF_BITSTREAM; + const BUFFER = AV_EF_BUFFER; + const EXPLODE = AV_EF_EXPLODE; - const IGNORE_ERROR = AV_EF_IGNORE_ERR, - const CAREFUL = AV_EF_CAREFUL, - const COMPLIANT = AV_EF_COMPLIANT, - const AGGRESSIVE = AV_EF_AGGRESSIVE, + const IGNORE_ERROR = AV_EF_IGNORE_ERR; + const CAREFUL = AV_EF_CAREFUL; + const COMPLIANT = AV_EF_COMPLIANT; + const AGGRESSIVE = AV_EF_AGGRESSIVE; } } diff --git a/src/codec/decoder/conceal.rs b/src/codec/decoder/conceal.rs index 596b6e3..d867faf 100644 --- a/src/codec/decoder/conceal.rs +++ b/src/codec/decoder/conceal.rs @@ -2,9 +2,9 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Conceal: c_int { - const GUESS_MVS = FF_EC_GUESS_MVS, - const DEBLOCK = FF_EC_DEBLOCK, - const FAVOR_INTER = FF_EC_FAVOR_INTER, + pub struct Conceal: c_int { + const GUESS_MVS = FF_EC_GUESS_MVS; + const DEBLOCK = FF_EC_DEBLOCK; + const FAVOR_INTER = FF_EC_FAVOR_INTER; } } diff --git a/src/codec/decoder/slice.rs b/src/codec/decoder/slice.rs index f3d42c0..687cbcf 100644 --- a/src/codec/decoder/slice.rs +++ b/src/codec/decoder/slice.rs @@ -2,9 +2,9 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Flags: c_int { - const CODED_ORDER = SLICE_FLAG_CODED_ORDER, - const ALLOW_FIELD = SLICE_FLAG_ALLOW_FIELD, - const ALLOW_PLANE = SLICE_FLAG_ALLOW_PLANE, + pub struct Flags: c_int { + const CODED_ORDER = SLICE_FLAG_CODED_ORDER; + const ALLOW_FIELD = SLICE_FLAG_ALLOW_FIELD; + const ALLOW_PLANE = SLICE_FLAG_ALLOW_PLANE; } } diff --git a/src/codec/flag.rs b/src/codec/flag.rs index 3748310..a87752a 100644 --- a/src/codec/flag.rs +++ b/src/codec/flag.rs @@ -2,25 +2,25 @@ use libc::c_uint; use ffi::*; bitflags! { - pub flags Flags: c_uint { - const UNALIGNED = AV_CODEC_FLAG_UNALIGNED, - const QSCALE = AV_CODEC_FLAG_QSCALE, - const _4MV = AV_CODEC_FLAG_4MV, - const OUTPUT_CORRUPT = AV_CODEC_FLAG_OUTPUT_CORRUPT, - const QPEL = AV_CODEC_FLAG_QPEL, - const PASS1 = AV_CODEC_FLAG_PASS1, - const PASS2 = AV_CODEC_FLAG_PASS2, - const GRAY = AV_CODEC_FLAG_GRAY, - const PSNR = AV_CODEC_FLAG_PSNR, - const TRUNCATED = AV_CODEC_FLAG_TRUNCATED, - const INTERLACED_DCT = AV_CODEC_FLAG_INTERLACED_DCT, - const LOW_DELAY = AV_CODEC_FLAG_LOW_DELAY, - const GLOBAL_HEADER = AV_CODEC_FLAG_GLOBAL_HEADER, - const BITEXACT = AV_CODEC_FLAG_BITEXACT, - const AC_PRED = AV_CODEC_FLAG_AC_PRED, - const LOOP_FILTER = AV_CODEC_FLAG_LOOP_FILTER, - const INTERLACED_ME = AV_CODEC_FLAG_INTERLACED_ME, - const CLOSED_GOP = AV_CODEC_FLAG_CLOSED_GOP, + pub struct Flags: c_uint { + const UNALIGNED = AV_CODEC_FLAG_UNALIGNED; + const QSCALE = AV_CODEC_FLAG_QSCALE; + const _4MV = AV_CODEC_FLAG_4MV; + const OUTPUT_CORRUPT = AV_CODEC_FLAG_OUTPUT_CORRUPT; + const QPEL = AV_CODEC_FLAG_QPEL; + const PASS1 = AV_CODEC_FLAG_PASS1; + const PASS2 = AV_CODEC_FLAG_PASS2; + const GRAY = AV_CODEC_FLAG_GRAY; + const PSNR = AV_CODEC_FLAG_PSNR; + const TRUNCATED = AV_CODEC_FLAG_TRUNCATED; + const INTERLACED_DCT = AV_CODEC_FLAG_INTERLACED_DCT; + const LOW_DELAY = AV_CODEC_FLAG_LOW_DELAY; + const GLOBAL_HEADER = AV_CODEC_FLAG_GLOBAL_HEADER; + const BITEXACT = AV_CODEC_FLAG_BITEXACT; + const AC_PRED = AV_CODEC_FLAG_AC_PRED; + const LOOP_FILTER = AV_CODEC_FLAG_LOOP_FILTER; + const INTERLACED_ME = AV_CODEC_FLAG_INTERLACED_ME; + const CLOSED_GOP = AV_CODEC_FLAG_CLOSED_GOP; } } diff --git a/src/codec/packet/flag.rs b/src/codec/packet/flag.rs index 8aa70a6..45ccff4 100644 --- a/src/codec/packet/flag.rs +++ b/src/codec/packet/flag.rs @@ -2,8 +2,8 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Flags: c_int { - const KEY = AV_PKT_FLAG_KEY, - const CORRUPT = AV_PKT_FLAG_CORRUPT, + pub struct Flags: c_int { + const KEY = AV_PKT_FLAG_KEY; + const CORRUPT = AV_PKT_FLAG_CORRUPT; } } diff --git a/src/codec/subtitle/flag.rs b/src/codec/subtitle/flag.rs index 1b10987..ecdaa0e 100644 --- a/src/codec/subtitle/flag.rs +++ b/src/codec/subtitle/flag.rs @@ -2,7 +2,7 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Flags: c_int { - const FORCED = AV_SUBTITLE_FLAG_FORCED, + pub struct Flags: c_int { + const FORCED = AV_SUBTITLE_FLAG_FORCED; } } diff --git a/src/filter/flag.rs b/src/filter/flag.rs index ba54b63..8b1b776 100644 --- a/src/filter/flag.rs +++ b/src/filter/flag.rs @@ -2,12 +2,12 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Flags: c_int { - const DYNAMIC_INPUTS = AVFILTER_FLAG_DYNAMIC_INPUTS, - const DYNAMIC_OUTPUTS = AVFILTER_FLAG_DYNAMIC_OUTPUTS, - const SLICE_THREADS = AVFILTER_FLAG_SLICE_THREADS, - const SUPPORT_TIMELINE_GENERIC = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, - const SUPPORT_TIMELINE_INTERNAL = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, - const SUPPORT_TIMELINE = AVFILTER_FLAG_SUPPORT_TIMELINE, + pub struct Flags: c_int { + const DYNAMIC_INPUTS = AVFILTER_FLAG_DYNAMIC_INPUTS; + const DYNAMIC_OUTPUTS = AVFILTER_FLAG_DYNAMIC_OUTPUTS; + const SLICE_THREADS = AVFILTER_FLAG_SLICE_THREADS; + const SUPPORT_TIMELINE_GENERIC = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC; + const SUPPORT_TIMELINE_INTERNAL = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL; + const SUPPORT_TIMELINE = AVFILTER_FLAG_SUPPORT_TIMELINE; } } diff --git a/src/format/format/flag.rs b/src/format/format/flag.rs index 4533915..854aabb 100644 --- a/src/format/format/flag.rs +++ b/src/format/format/flag.rs @@ -2,25 +2,25 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Flags: c_int { - const NO_FILE = AVFMT_NOFILE, - const NEED_NUMBER = AVFMT_NEEDNUMBER, - const SHOW_IDS = AVFMT_SHOW_IDS, - const RAW_PICTURE = AVFMT_RAWPICTURE, - const GLOBAL_HEADER = AVFMT_GLOBALHEADER, - const NO_TIMESTAMPS = AVFMT_NOTIMESTAMPS, - const GENERIC_INDEX = AVFMT_GENERIC_INDEX, - const TS_DISCONT = AVFMT_TS_DISCONT, - const VARIABLE_FPS = AVFMT_VARIABLE_FPS, - const NO_DIMENSIONS = AVFMT_NODIMENSIONS, - const NO_STREAMS = AVFMT_NOSTREAMS, - const NO_BINSEARCH = AVFMT_NOBINSEARCH, - const NO_GENSEARCH = AVFMT_NOGENSEARCH, - const NO_BYTE_SEEK = AVFMT_NO_BYTE_SEEK, - const ALLOW_FLUSH = AVFMT_ALLOW_FLUSH, - const TS_NONSTRICT = AVFMT_TS_NONSTRICT, - const TS_NEGATIVE = AVFMT_TS_NEGATIVE, - const SEEK_TO_PTS = AVFMT_SEEK_TO_PTS, + pub struct Flags: c_int { + const NO_FILE = AVFMT_NOFILE; + const NEED_NUMBER = AVFMT_NEEDNUMBER; + const SHOW_IDS = AVFMT_SHOW_IDS; + const RAW_PICTURE = AVFMT_RAWPICTURE; + const GLOBAL_HEADER = AVFMT_GLOBALHEADER; + const NO_TIMESTAMPS = AVFMT_NOTIMESTAMPS; + const GENERIC_INDEX = AVFMT_GENERIC_INDEX; + const TS_DISCONT = AVFMT_TS_DISCONT; + const VARIABLE_FPS = AVFMT_VARIABLE_FPS; + const NO_DIMENSIONS = AVFMT_NODIMENSIONS; + const NO_STREAMS = AVFMT_NOSTREAMS; + const NO_BINSEARCH = AVFMT_NOBINSEARCH; + const NO_GENSEARCH = AVFMT_NOGENSEARCH; + const NO_BYTE_SEEK = AVFMT_NO_BYTE_SEEK; + const ALLOW_FLUSH = AVFMT_ALLOW_FLUSH; + const TS_NONSTRICT = AVFMT_TS_NONSTRICT; + const TS_NEGATIVE = AVFMT_TS_NEGATIVE; + const SEEK_TO_PTS = AVFMT_SEEK_TO_PTS; } } diff --git a/src/format/stream/disposition.rs b/src/format/stream/disposition.rs index 14605b6..5bd0e38 100644 --- a/src/format/stream/disposition.rs +++ b/src/format/stream/disposition.rs @@ -2,20 +2,20 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Disposition: c_int { - const DEFAULT = AV_DISPOSITION_DEFAULT, - const DUB = AV_DISPOSITION_DUB, - const ORIGINAL = AV_DISPOSITION_ORIGINAL, - const COMMENT = AV_DISPOSITION_COMMENT, - const LYRICS = AV_DISPOSITION_LYRICS, - const KARAOKE = AV_DISPOSITION_KARAOKE, - const FORCED = AV_DISPOSITION_FORCED, - const HEARING_IMPAIRED = AV_DISPOSITION_HEARING_IMPAIRED, - const VISUAL_IMPAIRED = AV_DISPOSITION_VISUAL_IMPAIRED, - const CLEAN_EFFECTS = AV_DISPOSITION_CLEAN_EFFECTS, - const ATTACHED_PIC = AV_DISPOSITION_ATTACHED_PIC, - const CAPTIONS = AV_DISPOSITION_CAPTIONS, - const DESCRIPTIONS = AV_DISPOSITION_DESCRIPTIONS, - const METADATA = AV_DISPOSITION_METADATA, + pub struct Disposition: c_int { + const DEFAULT = AV_DISPOSITION_DEFAULT; + const DUB = AV_DISPOSITION_DUB; + const ORIGINAL = AV_DISPOSITION_ORIGINAL; + const COMMENT = AV_DISPOSITION_COMMENT; + const LYRICS = AV_DISPOSITION_LYRICS; + const KARAOKE = AV_DISPOSITION_KARAOKE; + const FORCED = AV_DISPOSITION_FORCED; + const HEARING_IMPAIRED = AV_DISPOSITION_HEARING_IMPAIRED; + const VISUAL_IMPAIRED = AV_DISPOSITION_VISUAL_IMPAIRED; + const CLEAN_EFFECTS = AV_DISPOSITION_CLEAN_EFFECTS; + const ATTACHED_PIC = AV_DISPOSITION_ATTACHED_PIC; + const CAPTIONS = AV_DISPOSITION_CAPTIONS; + const DESCRIPTIONS = AV_DISPOSITION_DESCRIPTIONS; + const METADATA = AV_DISPOSITION_METADATA; } } diff --git a/src/software/resampling/flag.rs b/src/software/resampling/flag.rs index 879c349..29a7a19 100644 --- a/src/software/resampling/flag.rs +++ b/src/software/resampling/flag.rs @@ -2,7 +2,7 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Flags: c_int { - const FORCE = SWR_FLAG_RESAMPLE, + pub struct Flags: c_int { + const FORCE = SWR_FLAG_RESAMPLE; } } diff --git a/src/software/scaling/flag.rs b/src/software/scaling/flag.rs index c72d03c..08d18c9 100644 --- a/src/software/scaling/flag.rs +++ b/src/software/scaling/flag.rs @@ -2,27 +2,27 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Flags: c_int { - const FAST_BILINEAR = SWS_FAST_BILINEAR, - const BILINEAR = SWS_BILINEAR, - const BICUBIC = SWS_BICUBIC, - const X = SWS_X, - const POINT = SWS_POINT, - const AREA = SWS_AREA, - const BICUBLIN = SWS_BICUBLIN, - const GAUSS = SWS_GAUSS, - const SINC = SWS_SINC, - const LANCZOS = SWS_LANCZOS, - const SPLINE = SWS_SPLINE, - const SRC_V_CHR_DROP_MASK = SWS_SRC_V_CHR_DROP_MASK, - const SRC_V_CHR_DROP_SHIFT = SWS_SRC_V_CHR_DROP_SHIFT, - const PARAM_DEFAULT = SWS_PARAM_DEFAULT, - const PRINT_INFO = SWS_PRINT_INFO, - const FULL_CHR_H_INT = SWS_FULL_CHR_H_INT, - const FULL_CHR_H_INP = SWS_FULL_CHR_H_INP, - const DIRECT_BGR = SWS_DIRECT_BGR, - const ACCURATE_RND = SWS_ACCURATE_RND, - const BITEXACT = SWS_BITEXACT, - const ERROR_DIFFUSION = SWS_ERROR_DIFFUSION, + pub struct Flags: c_int { + const FAST_BILINEAR = SWS_FAST_BILINEAR; + const BILINEAR = SWS_BILINEAR; + const BICUBIC = SWS_BICUBIC; + const X = SWS_X; + const POINT = SWS_POINT; + const AREA = SWS_AREA; + const BICUBLIN = SWS_BICUBLIN; + const GAUSS = SWS_GAUSS; + const SINC = SWS_SINC; + const LANCZOS = SWS_LANCZOS; + const SPLINE = SWS_SPLINE; + const SRC_V_CHR_DROP_MASK = SWS_SRC_V_CHR_DROP_MASK; + const SRC_V_CHR_DROP_SHIFT = SWS_SRC_V_CHR_DROP_SHIFT; + const PARAM_DEFAULT = SWS_PARAM_DEFAULT; + const PRINT_INFO = SWS_PRINT_INFO; + const FULL_CHR_H_INT = SWS_FULL_CHR_H_INT; + const FULL_CHR_H_INP = SWS_FULL_CHR_H_INP; + const DIRECT_BGR = SWS_DIRECT_BGR; + const ACCURATE_RND = SWS_ACCURATE_RND; + const BITEXACT = SWS_BITEXACT; + const ERROR_DIFFUSION = SWS_ERROR_DIFFUSION; } } diff --git a/src/util/channel_layout.rs b/src/util/channel_layout.rs index 805973e..77d7d9d 100644 --- a/src/util/channel_layout.rs +++ b/src/util/channel_layout.rs @@ -2,62 +2,62 @@ use libc::c_ulonglong; use ffi::*; bitflags! { - pub flags ChannelLayout: c_ulonglong { - const FRONT_LEFT = AV_CH_FRONT_LEFT, - const FRONT_RIGHT = AV_CH_FRONT_RIGHT, - const FRONT_CENTER = AV_CH_FRONT_CENTER, - const LOW_FREQUENCY = AV_CH_LOW_FREQUENCY, - const BACK_LEFT = AV_CH_BACK_LEFT, - const BACK_RIGHT = AV_CH_BACK_RIGHT, - const FRONT_LEFT_OF_CENTER = AV_CH_FRONT_LEFT_OF_CENTER, - const FRONT_RIGHT_OF_CENTER = AV_CH_FRONT_RIGHT_OF_CENTER, - const BACK_CENTER = AV_CH_BACK_CENTER, - const SIDE_LEFT = AV_CH_SIDE_LEFT, - const SIDE_RIGHT = AV_CH_SIDE_RIGHT, - const TOP_CENTER = AV_CH_TOP_CENTER, - const TOP_FRONT_LEFT = AV_CH_TOP_FRONT_LEFT, - const TOP_FRONT_CENTER = AV_CH_TOP_FRONT_CENTER, - const TOP_FRONT_RIGHT = AV_CH_TOP_FRONT_RIGHT, - const TOP_BACK_LEFT = AV_CH_TOP_BACK_LEFT, - const TOP_BACK_CENTER = AV_CH_TOP_BACK_CENTER, - const TOP_BACK_RIGHT = AV_CH_TOP_BACK_RIGHT, - const STEREO_LEFT = AV_CH_STEREO_LEFT, - const STEREO_RIGHT = AV_CH_STEREO_RIGHT, - const WIDE_LEFT = AV_CH_WIDE_LEFT, - const WIDE_RIGHT = AV_CH_WIDE_RIGHT, - const SURROUND_DIRECT_LEFT = AV_CH_SURROUND_DIRECT_LEFT, - const SURROUND_DIRECT_RIGHT = AV_CH_SURROUND_DIRECT_RIGHT, - const LOW_FREQUENCY_2 = AV_CH_LOW_FREQUENCY_2, - const NATIVE = AV_CH_LAYOUT_NATIVE, + pub struct ChannelLayout: c_ulonglong { + const FRONT_LEFT = AV_CH_FRONT_LEFT; + const FRONT_RIGHT = AV_CH_FRONT_RIGHT; + const FRONT_CENTER = AV_CH_FRONT_CENTER; + const LOW_FREQUENCY = AV_CH_LOW_FREQUENCY; + const BACK_LEFT = AV_CH_BACK_LEFT; + const BACK_RIGHT = AV_CH_BACK_RIGHT; + const FRONT_LEFT_OF_CENTER = AV_CH_FRONT_LEFT_OF_CENTER; + const FRONT_RIGHT_OF_CENTER = AV_CH_FRONT_RIGHT_OF_CENTER; + const BACK_CENTER = AV_CH_BACK_CENTER; + const SIDE_LEFT = AV_CH_SIDE_LEFT; + const SIDE_RIGHT = AV_CH_SIDE_RIGHT; + const TOP_CENTER = AV_CH_TOP_CENTER; + const TOP_FRONT_LEFT = AV_CH_TOP_FRONT_LEFT; + const TOP_FRONT_CENTER = AV_CH_TOP_FRONT_CENTER; + const TOP_FRONT_RIGHT = AV_CH_TOP_FRONT_RIGHT; + const TOP_BACK_LEFT = AV_CH_TOP_BACK_LEFT; + const TOP_BACK_CENTER = AV_CH_TOP_BACK_CENTER; + const TOP_BACK_RIGHT = AV_CH_TOP_BACK_RIGHT; + const STEREO_LEFT = AV_CH_STEREO_LEFT; + const STEREO_RIGHT = AV_CH_STEREO_RIGHT; + const WIDE_LEFT = AV_CH_WIDE_LEFT; + const WIDE_RIGHT = AV_CH_WIDE_RIGHT; + const SURROUND_DIRECT_LEFT = AV_CH_SURROUND_DIRECT_LEFT; + const SURROUND_DIRECT_RIGHT = AV_CH_SURROUND_DIRECT_RIGHT; + const LOW_FREQUENCY_2 = AV_CH_LOW_FREQUENCY_2; + const NATIVE = AV_CH_LAYOUT_NATIVE; - const MONO = AV_CH_LAYOUT_MONO, - const STEREO = AV_CH_LAYOUT_STEREO, - const _2POINT1 = AV_CH_LAYOUT_2POINT1, - const _2_1 = AV_CH_LAYOUT_2_1, - const SURROUND = AV_CH_LAYOUT_SURROUND, - const _3POINT1 = AV_CH_LAYOUT_3POINT1, - const _4POINT0 = AV_CH_LAYOUT_4POINT0, - const _4POINT1 = AV_CH_LAYOUT_4POINT1, - const _2_2 = AV_CH_LAYOUT_2_2, - const QUAD = AV_CH_LAYOUT_QUAD, - const _5POINT0 = AV_CH_LAYOUT_5POINT0, - const _5POINT1 = AV_CH_LAYOUT_5POINT1, - const _5POINT0_BACK = AV_CH_LAYOUT_5POINT0_BACK, - const _5POINT1_BACK = AV_CH_LAYOUT_5POINT1_BACK, - const _6POINT0 = AV_CH_LAYOUT_6POINT0, - const _6POINT0_FRONT = AV_CH_LAYOUT_6POINT0_FRONT, - const HEXAGONAL = AV_CH_LAYOUT_HEXAGONAL, - const _6POINT1 = AV_CH_LAYOUT_6POINT1, - const _6POINT1_BACK = AV_CH_LAYOUT_6POINT1_BACK, - const _6POINT1_FRONT = AV_CH_LAYOUT_6POINT1_FRONT, - const _7POINT0 = AV_CH_LAYOUT_7POINT0, - const _7POINT0_FRONT = AV_CH_LAYOUT_7POINT0_FRONT, - const _7POINT1 = AV_CH_LAYOUT_7POINT1, - const _7POINT1_WIDE = AV_CH_LAYOUT_7POINT1_WIDE, - const _7POINT1_WIDE_BACK = AV_CH_LAYOUT_7POINT1_WIDE_BACK, - const OCTAGONAL = AV_CH_LAYOUT_OCTAGONAL, - const HEXADECAGONAL = AV_CH_LAYOUT_HEXADECAGONAL, - const STEREO_DOWNMIX = AV_CH_LAYOUT_STEREO_DOWNMIX, + const MONO = AV_CH_LAYOUT_MONO; + const STEREO = AV_CH_LAYOUT_STEREO; + const _2POINT1 = AV_CH_LAYOUT_2POINT1; + const _2_1 = AV_CH_LAYOUT_2_1; + const SURROUND = AV_CH_LAYOUT_SURROUND; + const _3POINT1 = AV_CH_LAYOUT_3POINT1; + const _4POINT0 = AV_CH_LAYOUT_4POINT0; + const _4POINT1 = AV_CH_LAYOUT_4POINT1; + const _2_2 = AV_CH_LAYOUT_2_2; + const QUAD = AV_CH_LAYOUT_QUAD; + const _5POINT0 = AV_CH_LAYOUT_5POINT0; + const _5POINT1 = AV_CH_LAYOUT_5POINT1; + const _5POINT0_BACK = AV_CH_LAYOUT_5POINT0_BACK; + const _5POINT1_BACK = AV_CH_LAYOUT_5POINT1_BACK; + const _6POINT0 = AV_CH_LAYOUT_6POINT0; + const _6POINT0_FRONT = AV_CH_LAYOUT_6POINT0_FRONT; + const HEXAGONAL = AV_CH_LAYOUT_HEXAGONAL; + const _6POINT1 = AV_CH_LAYOUT_6POINT1; + const _6POINT1_BACK = AV_CH_LAYOUT_6POINT1_BACK; + const _6POINT1_FRONT = AV_CH_LAYOUT_6POINT1_FRONT; + const _7POINT0 = AV_CH_LAYOUT_7POINT0; + const _7POINT0_FRONT = AV_CH_LAYOUT_7POINT0_FRONT; + const _7POINT1 = AV_CH_LAYOUT_7POINT1; + const _7POINT1_WIDE = AV_CH_LAYOUT_7POINT1_WIDE; + const _7POINT1_WIDE_BACK = AV_CH_LAYOUT_7POINT1_WIDE_BACK; + const OCTAGONAL = AV_CH_LAYOUT_OCTAGONAL; + const HEXADECAGONAL = AV_CH_LAYOUT_HEXADECAGONAL; + const STEREO_DOWNMIX = AV_CH_LAYOUT_STEREO_DOWNMIX; } } diff --git a/src/util/frame/flag.rs b/src/util/frame/flag.rs index 53990d7..a1cc67e 100644 --- a/src/util/frame/flag.rs +++ b/src/util/frame/flag.rs @@ -2,7 +2,7 @@ use libc::c_int; use ffi::*; bitflags! { - pub flags Flags: c_int { - const CORRUPT = AV_FRAME_FLAG_CORRUPT, + pub struct Flags: c_int { + const CORRUPT = AV_FRAME_FLAG_CORRUPT; } }