Skip to content

Commit

Permalink
* Use long instead of int for constants starting with `AV_CH_LAY…
Browse files Browse the repository at this point in the history 
…OUT_` in `avutil` (pull #455)
  • Loading branch information
@ishitatsuyuki @saudet
ishitatsuyuki authored and saudet committed Sep 1, 2017
1 parent c62b5cc commit 694b816
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 48 deletions.
94 changes: 47 additions & 47 deletions ffmpeg/src/main/java/org/bytedeco/javacpp/avutil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4553,28 +4553,28 @@ public static class AVFrame extends Pointer {
*
* \{
*/
public static final int AV_CH_FRONT_LEFT = 0x00000001;
public static final int AV_CH_FRONT_RIGHT = 0x00000002;
public static final int AV_CH_FRONT_CENTER = 0x00000004;
public static final int AV_CH_LOW_FREQUENCY = 0x00000008;
public static final int AV_CH_BACK_LEFT = 0x00000010;
public static final int AV_CH_BACK_RIGHT = 0x00000020;
public static final int AV_CH_FRONT_LEFT_OF_CENTER = 0x00000040;
public static final int AV_CH_FRONT_RIGHT_OF_CENTER = 0x00000080;
public static final int AV_CH_BACK_CENTER = 0x00000100;
public static final int AV_CH_SIDE_LEFT = 0x00000200;
public static final int AV_CH_SIDE_RIGHT = 0x00000400;
public static final int AV_CH_TOP_CENTER = 0x00000800;
public static final int AV_CH_TOP_FRONT_LEFT = 0x00001000;
public static final int AV_CH_TOP_FRONT_CENTER = 0x00002000;
public static final int AV_CH_TOP_FRONT_RIGHT = 0x00004000;
public static final int AV_CH_TOP_BACK_LEFT = 0x00008000;
public static final int AV_CH_TOP_BACK_CENTER = 0x00010000;
public static final int AV_CH_TOP_BACK_RIGHT = 0x00020000;
public static final long AV_CH_FRONT_LEFT = 0x00000001;
public static final long AV_CH_FRONT_RIGHT = 0x00000002;
public static final long AV_CH_FRONT_CENTER = 0x00000004;
public static final long AV_CH_LOW_FREQUENCY = 0x00000008;
public static final long AV_CH_BACK_LEFT = 0x00000010;
public static final long AV_CH_BACK_RIGHT = 0x00000020;
public static final long AV_CH_FRONT_LEFT_OF_CENTER = 0x00000040;
public static final long AV_CH_FRONT_RIGHT_OF_CENTER = 0x00000080;
public static final long AV_CH_BACK_CENTER = 0x00000100;
public static final long AV_CH_SIDE_LEFT = 0x00000200;
public static final long AV_CH_SIDE_RIGHT = 0x00000400;
public static final long AV_CH_TOP_CENTER = 0x00000800;
public static final long AV_CH_TOP_FRONT_LEFT = 0x00001000;
public static final long AV_CH_TOP_FRONT_CENTER = 0x00002000;
public static final long AV_CH_TOP_FRONT_RIGHT = 0x00004000;
public static final long AV_CH_TOP_BACK_LEFT = 0x00008000;
public static final long AV_CH_TOP_BACK_CENTER = 0x00010000;
public static final long AV_CH_TOP_BACK_RIGHT = 0x00020000;
/** Stereo downmix. */
public static final int AV_CH_STEREO_LEFT = 0x20000000;
public static final long AV_CH_STEREO_LEFT = 0x20000000;
/** See AV_CH_STEREO_LEFT. */
public static final int AV_CH_STEREO_RIGHT = 0x40000000;
public static final long AV_CH_STEREO_RIGHT = 0x40000000;
public static final long AV_CH_WIDE_LEFT = 0x0000000080000000L;
public static final long AV_CH_WIDE_RIGHT = 0x0000000100000000L;
public static final long AV_CH_SURROUND_DIRECT_LEFT = 0x0000000200000000L;
Expand All @@ -4591,34 +4591,34 @@ public static class AVFrame extends Pointer {
* \defgroup channel_mask_c Audio channel layouts
* \{
* */
public static final int AV_CH_LAYOUT_MONO = (AV_CH_FRONT_CENTER);
public static final int AV_CH_LAYOUT_STEREO = (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT);
public static final int AV_CH_LAYOUT_2POINT1 = (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY);
public static final int AV_CH_LAYOUT_2_1 = (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER);
public static final int AV_CH_LAYOUT_SURROUND = (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER);
public static final int AV_CH_LAYOUT_3POINT1 = (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY);
public static final int AV_CH_LAYOUT_4POINT0 = (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER);
public static final int AV_CH_LAYOUT_4POINT1 = (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY);
public static final int AV_CH_LAYOUT_2_2 = (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT);
public static final int AV_CH_LAYOUT_QUAD = (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT);
public static final int AV_CH_LAYOUT_5POINT0 = (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT);
public static final int AV_CH_LAYOUT_5POINT1 = (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY);
public static final int AV_CH_LAYOUT_5POINT0_BACK = (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT);
public static final int AV_CH_LAYOUT_5POINT1_BACK = (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY);
public static final int AV_CH_LAYOUT_6POINT0 = (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER);
public static final int AV_CH_LAYOUT_6POINT0_FRONT = (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER);
public static final int AV_CH_LAYOUT_HEXAGONAL = (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER);
public static final int AV_CH_LAYOUT_6POINT1 = (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER);
public static final int AV_CH_LAYOUT_6POINT1_BACK = (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER);
public static final int AV_CH_LAYOUT_6POINT1_FRONT = (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY);
public static final int AV_CH_LAYOUT_7POINT0 = (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT);
public static final int AV_CH_LAYOUT_7POINT0_FRONT = (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER);
public static final int AV_CH_LAYOUT_7POINT1 = (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT);
public static final int AV_CH_LAYOUT_7POINT1_WIDE = (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER);
public static final int AV_CH_LAYOUT_7POINT1_WIDE_BACK = (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER);
public static final int AV_CH_LAYOUT_OCTAGONAL = (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT);
public static final long AV_CH_LAYOUT_MONO = (AV_CH_FRONT_CENTER);
public static final long AV_CH_LAYOUT_STEREO = (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT);
public static final long AV_CH_LAYOUT_2POINT1 = (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY);
public static final long AV_CH_LAYOUT_2_1 = (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER);
public static final long AV_CH_LAYOUT_SURROUND = (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER);
public static final long AV_CH_LAYOUT_3POINT1 = (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY);
public static final long AV_CH_LAYOUT_4POINT0 = (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER);
public static final long AV_CH_LAYOUT_4POINT1 = (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY);
public static final long AV_CH_LAYOUT_2_2 = (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT);
public static final long AV_CH_LAYOUT_QUAD = (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT);
public static final long AV_CH_LAYOUT_5POINT0 = (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT);
public static final long AV_CH_LAYOUT_5POINT1 = (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY);
public static final long AV_CH_LAYOUT_5POINT0_BACK = (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT);
public static final long AV_CH_LAYOUT_5POINT1_BACK = (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY);
public static final long AV_CH_LAYOUT_6POINT0 = (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER);
public static final long AV_CH_LAYOUT_6POINT0_FRONT = (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER);
public static final long AV_CH_LAYOUT_HEXAGONAL = (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER);
public static final long AV_CH_LAYOUT_6POINT1 = (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER);
public static final long AV_CH_LAYOUT_6POINT1_BACK = (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER);
public static final long AV_CH_LAYOUT_6POINT1_FRONT = (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY);
public static final long AV_CH_LAYOUT_7POINT0 = (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT);
public static final long AV_CH_LAYOUT_7POINT0_FRONT = (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER);
public static final long AV_CH_LAYOUT_7POINT1 = (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT);
public static final long AV_CH_LAYOUT_7POINT1_WIDE = (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER);
public static final long AV_CH_LAYOUT_7POINT1_WIDE_BACK = (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER);
public static final long AV_CH_LAYOUT_OCTAGONAL = (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT);
public static final long AV_CH_LAYOUT_HEXADECAGONAL = (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT);
public static final int AV_CH_LAYOUT_STEREO_DOWNMIX = (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT);
public static final long AV_CH_LAYOUT_STEREO_DOWNMIX = (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT);

/** enum AVMatrixEncoding */
public static final int
Expand Down
55 changes: 54 additions & 1 deletion ffmpeg/src/main/java/org/bytedeco/javacpp/presets/avutil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,60 @@ public void map(InfoMap infoMap) {
.put(new Info("AV_PIX_FMT_ABI_GIT_MASTER", "AV_HAVE_INCOMPATIBLE_LIBAV_ABI", "!FF_API_XVMC",
"FF_API_GET_BITS_PER_SAMPLE_FMT", "FF_API_FIND_OPT").define(false))
.put(new Info("AV_PIX_FMT_Y400A", "ff_check_pixfmt_descriptors").skip())
.put(new Info("AV_CH_LAYOUT_HEXADECAGONAL").translate().cppTypes("long"))
.put(new Info("AV_CH_FRONT_LEFT",
"AV_CH_FRONT_RIGHT",
"AV_CH_FRONT_CENTER",
"AV_CH_LOW_FREQUENCY",
"AV_CH_BACK_LEFT",
"AV_CH_BACK_RIGHT",
"AV_CH_FRONT_LEFT_OF_CENTER",
"AV_CH_FRONT_RIGHT_OF_CENTER",
"AV_CH_BACK_CENTER",
"AV_CH_SIDE_LEFT",
"AV_CH_SIDE_RIGHT",
"AV_CH_TOP_CENTER",
"AV_CH_TOP_FRONT_LEFT",
"AV_CH_TOP_FRONT_CENTER",
"AV_CH_TOP_FRONT_RIGHT",
"AV_CH_TOP_BACK_LEFT",
"AV_CH_TOP_BACK_CENTER",
"AV_CH_TOP_BACK_RIGHT",
"AV_CH_STEREO_LEFT",
"AV_CH_STEREO_RIGHT",
"AV_CH_WIDE_LEFT",
"AV_CH_WIDE_RIGHT",
"AV_CH_SURROUND_DIRECT_LEFT",
"AV_CH_SURROUND_DIRECT_RIGHT",
"AV_CH_LOW_FREQUENCY_2",
"AV_CH_LAYOUT_NATIVE",
"AV_CH_LAYOUT_MONO",
"AV_CH_LAYOUT_STEREO",
"AV_CH_LAYOUT_2POINT1",
"AV_CH_LAYOUT_2_1",
"AV_CH_LAYOUT_SURROUND",
"AV_CH_LAYOUT_3POINT1",
"AV_CH_LAYOUT_4POINT0",
"AV_CH_LAYOUT_4POINT1",
"AV_CH_LAYOUT_2_2",
"AV_CH_LAYOUT_QUAD",
"AV_CH_LAYOUT_5POINT0",
"AV_CH_LAYOUT_5POINT1",
"AV_CH_LAYOUT_5POINT0_BACK",
"AV_CH_LAYOUT_5POINT1_BACK",
"AV_CH_LAYOUT_6POINT0",
"AV_CH_LAYOUT_6POINT0_FRONT",
"AV_CH_LAYOUT_HEXAGONAL",
"AV_CH_LAYOUT_6POINT1",
"AV_CH_LAYOUT_6POINT1_BACK",
"AV_CH_LAYOUT_6POINT1_FRONT",
"AV_CH_LAYOUT_7POINT0",
"AV_CH_LAYOUT_7POINT0_FRONT",
"AV_CH_LAYOUT_7POINT1",
"AV_CH_LAYOUT_7POINT1_WIDE",
"AV_CH_LAYOUT_7POINT1_WIDE_BACK",
"AV_CH_LAYOUT_OCTAGONAL",
"AV_CH_LAYOUT_HEXADECAGONAL",
"AV_CH_LAYOUT_STEREO_DOWNMIX").translate().cppTypes("long"))
.put(new Info("int (*)(void*, void*, int)").pointerTypes("Int_func_Pointer_Pointer_int"));
}
}

0 comments on commit 694b816

Please sign in to comment.