Skip to content
Snippets Groups Projects
Commit d8934ecc authored by Thibault Fighiera's avatar Thibault Fighiera Committed by Nicolas Pomepuy
Browse files

feat(Codec): add fourcc code in Track info

parent ea1a7547
No related branches found
No related tags found
1 merge request!929feat(Codec): add fourcc code in Track info
Pipeline #80337 passed with stage
in 19 minutes and 43 seconds
......@@ -433,6 +433,7 @@ media_track_to_object(JNIEnv *env, libvlc_media_track_t *p_tracks)
fields.Media.createAudioTrackFromNativeID,
jcodec,
joriginalCodec,
(jint)p_tracks->i_original_fourcc,
(jint)p_tracks->i_id,
(jint)p_tracks->i_profile,
(jint)p_tracks->i_level,
......@@ -447,6 +448,7 @@ media_track_to_object(JNIEnv *env, libvlc_media_track_t *p_tracks)
fields.Media.createVideoTrackFromNativeID,
jcodec,
joriginalCodec,
(jint)p_tracks->i_original_fourcc,
(jint)p_tracks->i_id,
(jint)p_tracks->i_profile,
(jint)p_tracks->i_level,
......@@ -472,6 +474,7 @@ media_track_to_object(JNIEnv *env, libvlc_media_track_t *p_tracks)
fields.Media.createSubtitleTrackFromNativeID,
jcodec,
joriginalCodec,
(jint)p_tracks->i_original_fourcc,
(jint)p_tracks->i_id,
(jint)p_tracks->i_profile,
(jint)p_tracks->i_level,
......@@ -488,6 +491,7 @@ media_track_to_object(JNIEnv *env, libvlc_media_track_t *p_tracks)
fields.Media.createUnknownTrackFromNativeID,
jcodec,
joriginalCodec,
(jint)p_tracks->i_original_fourcc,
(jint)p_tracks->i_id,
(jint)p_tracks->i_profile,
(jint)p_tracks->i_level,
......
......@@ -215,28 +215,28 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved)
fields.Media.createAudioTrackFromNativeID,
fields.Media.clazz,
"createAudioTrackFromNative",
"(Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;Ljava/lang/String;II)"
"(Ljava/lang/String;Ljava/lang/String;IIIIILjava/lang/String;Ljava/lang/String;II)"
"Lorg/videolan/libvlc/interfaces/IMedia$Track;");
GET_ID(GetStaticMethodID,
fields.Media.createVideoTrackFromNativeID,
fields.Media.clazz,
"createVideoTrackFromNative",
"(Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;Ljava/lang/String;IIIIIIII)"
"(Ljava/lang/String;Ljava/lang/String;IIIIILjava/lang/String;Ljava/lang/String;IIIIIIII)"
"Lorg/videolan/libvlc/interfaces/IMedia$Track;");
GET_ID(GetStaticMethodID,
fields.Media.createSubtitleTrackFromNativeID,
fields.Media.clazz,
"createSubtitleTrackFromNative",
"(Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)"
"(Ljava/lang/String;Ljava/lang/String;IIIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)"
"Lorg/videolan/libvlc/interfaces/IMedia$Track;");
GET_ID(GetStaticMethodID,
fields.Media.createUnknownTrackFromNativeID,
fields.Media.clazz,
"createUnknownTrackFromNative",
"(Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;Ljava/lang/String;)"
"(Ljava/lang/String;Ljava/lang/String;IIIIILjava/lang/String;Ljava/lang/String;)"
"Lorg/videolan/libvlc/interfaces/IMedia$Track;");
GET_ID(GetStaticMethodID,
......
......@@ -39,37 +39,37 @@ public class Media extends VLCObject<IMedia.Event> implements IMedia {
private final static String TAG = "LibVLC/Media";
@SuppressWarnings("unused") /* Used from JNI */
private static Track createAudioTrackFromNative(String codec, String originalCodec, int id, int profile,
private static Track createAudioTrackFromNative(String codec, String originalCodec, int fourcc, int id, int profile,
int level, int bitrate, String language, String description,
int channels, int rate) {
return new AudioTrack(codec, originalCodec, id, profile,
return new AudioTrack(codec, originalCodec, fourcc, id, profile,
level, bitrate, language, description,
channels, rate);
}
@SuppressWarnings("unused") /* Used from JNI */
private static Track createVideoTrackFromNative(String codec, String originalCodec, int id, int profile,
private static Track createVideoTrackFromNative(String codec, String originalCodec, int fourcc, int id, int profile,
int level, int bitrate, String language, String description,
int height, int width, int sarNum, int sarDen, int frameRateNum, int frameRateDen,
int orientation, int projection) {
return new VideoTrack(codec, originalCodec, id, profile,
return new VideoTrack(codec, originalCodec, fourcc, id, profile,
level, bitrate, language, description,
height, width, sarNum, sarDen, frameRateNum, frameRateDen, orientation, projection);
}
@SuppressWarnings("unused") /* Used from JNI */
private static Track createSubtitleTrackFromNative(String codec, String originalCodec, int id, int profile,
private static Track createSubtitleTrackFromNative(String codec, String originalCodec, int fourcc, int id, int profile,
int level, int bitrate, String language, String description,
String encoding) {
return new SubtitleTrack(codec, originalCodec, id, profile,
return new SubtitleTrack(codec, originalCodec, fourcc, id, profile,
level, bitrate, language, description,
encoding);
}
@SuppressWarnings("unused") /* Used from JNI */
private static Track createUnknownTrackFromNative(String codec, String originalCodec, int id, int profile,
private static Track createUnknownTrackFromNative(String codec, String originalCodec, int fourcc, int id, int profile,
int level, int bitrate, String language, String description) {
return new UnknownTrack(codec, originalCodec, id, profile,
return new UnknownTrack(codec, originalCodec, fourcc, id, profile,
level, bitrate, language, description);
}
......
......@@ -131,6 +131,7 @@ public interface IMedia extends IVLCObject<IMedia.Event> {
public final int type;
public final String codec;
public final String originalCodec;
public final int fourcc;
public final int id;
public final int profile;
public final int level;
......@@ -138,11 +139,12 @@ public interface IMedia extends IVLCObject<IMedia.Event> {
public final String language;
public final String description;
protected Track(int type, String codec, String originalCodec, int id, int profile,
protected Track(int type, String codec, String originalCodec, int fourcc, int id, int profile,
int level, int bitrate, String language, String description) {
this.type = type;
this.codec = codec;
this.originalCodec = originalCodec;
this.fourcc = fourcc;
this.id = id;
this.profile = profile;
this.level = level;
......@@ -159,10 +161,10 @@ public interface IMedia extends IVLCObject<IMedia.Event> {
public final int channels;
public final int rate;
public AudioTrack(String codec, String originalCodec, int id, int profile,
public AudioTrack(String codec, String originalCodec, int fourcc, int id, int profile,
int level, int bitrate, String language, String description,
int channels, int rate) {
super(Type.Audio, codec, originalCodec, id, profile, level, bitrate, language, description);
super(Type.Audio, codec, originalCodec, fourcc, id, profile, level, bitrate, language, description);
this.channels = channels;
this.rate = rate;
}
......@@ -225,11 +227,11 @@ public interface IMedia extends IVLCObject<IMedia.Event> {
public final int orientation;
public final int projection;
public VideoTrack(String codec, String originalCodec, int id, int profile,
public VideoTrack(String codec, String originalCodec, int fourcc, int id, int profile,
int level, int bitrate, String language, String description,
int height, int width, int sarNum, int sarDen, int frameRateNum, int frameRateDen,
int orientation, int projection) {
super(Type.Video, codec, originalCodec, id, profile, level, bitrate, language, description);
super(Type.Video, codec, originalCodec, fourcc, id, profile, level, bitrate, language, description);
this.height = height;
this.width = width;
this.sarNum = sarNum;
......@@ -247,10 +249,10 @@ public interface IMedia extends IVLCObject<IMedia.Event> {
class SubtitleTrack extends Track {
public final String encoding;
public SubtitleTrack(String codec, String originalCodec, int id, int profile,
public SubtitleTrack(String codec, String originalCodec, int fourcc, int id, int profile,
int level, int bitrate, String language, String description,
String encoding) {
super(Type.Text, codec, originalCodec, id, profile, level, bitrate, language, description);
super(Type.Text, codec, originalCodec, fourcc, id, profile, level, bitrate, language, description);
this.encoding = encoding;
}
}
......@@ -259,9 +261,9 @@ public interface IMedia extends IVLCObject<IMedia.Event> {
* see libvlc_subtitle_track_t
*/
class UnknownTrack extends Track {
public UnknownTrack(String codec, String originalCodec, int id, int profile,
public UnknownTrack(String codec, String originalCodec, int fourcc, int id, int profile,
int level, int bitrate, String language, String description) {
super(Type.Unknown, codec, originalCodec, id, profile, level, bitrate, language, description);
super(Type.Unknown, codec, originalCodec, fourcc, id, profile, level, bitrate, language, description);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment