Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-07-09 03:04:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from AnonymusRaccoon/beta

Browse Source 
Making memory management more efficient.
This commit is contained in:
Zoe Roux 2019-09-27 01:26:57 +02:00
commit 51694fbc53
3 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Kyoo.Transcoder/src/Transcoder.cpp
View File

@ -222,7 +222,7 @@ Stream *ExtractSubtitles(const char *path, const char *outPath, int *streamCount
if (inputCodecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) if (inputCodecpar->codec_type != AVMEDIA_TYPE_SUBTITLE)
outputList[i] = NULL; outputList[i] = NULL;
else else
{ {
//Get metadata for file name //Get metadata for file name
Stream stream(NULL, //title Stream stream(NULL, //title
av_dict_get(inputStream->metadata, "language", NULL, 0)->value, //language av_dict_get(inputStream->metadata, "language", NULL, 0)->value, //language
@ -344,4 +344,9 @@ Stream *ExtractSubtitles(const char *path, const char *outPath, int *streamCount
return subtitleStreams; return subtitleStreams;
//*streamCount = subtitleStreams->size(); //*streamCount = subtitleStreams->size();
//return subtitleStreams->data(); //return subtitleStreams->data();
}
void FreeMemory(Stream *streamsPtr)
{
delete[] streamsPtr;
} }

4
Kyoo.Transcoder/src/Transcoder.h
View File

@ -11,7 +11,9 @@
extern "C" API int Init(); extern "C" API int Init();
extern "C" API int Transmux(const char *path, const char *outPath);
//Take the path of the file and the path of the output directory. It will return the list of subtitle streams in the streams variable. The int returned is the number of subtitles extracted. //Take the path of the file and the path of the output directory. It will return the list of subtitle streams in the streams variable. The int returned is the number of subtitles extracted.
extern "C" API Stream *ExtractSubtitles(const char *path, const char *outPath, int *streamCount, int *subtitleCount); extern "C" API Stream *ExtractSubtitles(const char *path, const char *outPath, int *streamCount, int *subtitleCount);
extern "C" API int Transmux(const char *path, const char *outPath); extern "C" API void FreeMemory(Stream *streamsPtr);

48
Kyoo/InternalAPI/Transcoder/TranscoderAPI.cs
View File

@ -16,33 +16,37 @@ namespace Kyoo.InternalAPI.TranscoderLink
public extern static int Transmux(string path, string outPath); public extern static int Transmux(string path, string outPath);
[DllImport(TranscoderPath, CallingConvention = CallingConvention.Cdecl)] [DllImport(TranscoderPath, CallingConvention = CallingConvention.Cdecl)]
[return:MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.LPStruct, SizeParamIndex = 3)] private extern static IntPtr ExtractSubtitles(string path, string outPath, out int arrayLength, out int trackCount);
private extern static Stream[] ExtractSubtitles(string path, string outPath, out int arrayLength/*, out int trackCount*/);
[DllImport(TranscoderPath, CallingConvention = CallingConvention.Cdecl)]
private extern static void FreeMemory(IntPtr streamsPtr);
public static void ExtractSubtitles(string path, string outPath, out Track[] tracks) public static void ExtractSubtitles(string path, string outPath, out Track[] tracks)
{ {
//int size = Marshal.SizeOf<Stream>(); int size = Marshal.SizeOf<Stream>();
Stream[] streamsPtr = ExtractSubtitles(path, outPath, out int count/*, out int trackCount*/); IntPtr ptr = ExtractSubtitles(path, outPath, out int arrayLength, out int trackCount);
tracks = null; IntPtr streamsPtr = ptr;
//if (trackCount > 0) if (trackCount > 0)
//{ {
// tracks = new Track[trackCount]; tracks = new Track[trackCount];
// int j = 0; int j = 0;
// for (int i = 0; i < arrayLength; i++) for (int i = 0; i < arrayLength; i++)
// { {
// Stream stream = Marshal.PtrToStructure<Stream>(streamsPtr); Stream stream = Marshal.PtrToStructure<Stream>(streamsPtr);
// if (stream.Codec != null) //If the codec is null, the stream doesn't represent a subtitle. if (stream.Codec != null) //If the codec is null, the stream doesn't represent a subtitle.
// { {
// tracks[j] = Track.From(stream, StreamType.Subtitle); tracks[j] = Track.From(stream, StreamType.Subtitle);
// j++; j++;
// } }
// streamsPtr += size; streamsPtr += size;
// } }
//} }
//else else
// tracks = null; tracks = null;
FreeMemory(ptr);
} }
} }
} }