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

Solving a memory bug.

Browse Source
This commit is contained in:
Zoe Roux 2019-09-27 15:40:13 +02:00
parent 229be6e4b9
commit 49c3cc7a5f
4 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Kyoo.Transcoder/src/Stream.h
View File

@ -10,9 +10,9 @@
extern "C" struct Stream extern "C" struct Stream
{ {
const char *title; char *title;
const char *language; char *language;
const char *codec; char *codec;
bool isDefault; bool isDefault;
bool isForced; bool isForced;
char *path; char *path;
@ -20,6 +20,15 @@ extern "C" struct Stream
Stream() Stream()
: title(NULL), language(NULL), codec(NULL), isDefault(NULL), isForced(NULL), path(NULL) {} : title(NULL), language(NULL), codec(NULL), isDefault(NULL), isForced(NULL), path(NULL) {}
Stream(const char* title, const char* languageCode, const char* codec, bool isDefault, bool isForced, char* path) Stream(const char* title, const char* languageCode, const char* codec, bool isDefault, bool isForced)
: title(title), language(languageCode), codec(codec), isDefault(isDefault), isForced(isForced), path(path) { } : title(NULL), language(NULL), codec(NULL), isDefault(isDefault), isForced(isForced), path(NULL)
{
if(title != NULL)
this->title= _strdup(title);
if(languageCode != NULL)
language = _strdup(languageCode);
if (codec != NULL)
this->codec = _strdup(codec);
}
}; };

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

@ -209,7 +209,7 @@ Stream *ExtractSubtitles(const char *path, const char *outPath, int *streamCount
*streamCount = inputContext->nb_streams; *streamCount = inputContext->nb_streams;
*subtitleCount = 0; *subtitleCount = 0;
Stream *subtitleStreams = new Stream[*streamCount]; Stream *streams = new Stream[*streamCount];
const unsigned int outputCount = inputContext->nb_streams; const unsigned int outputCount = inputContext->nb_streams;
AVFormatContext **outputList = new AVFormatContext*[outputCount]; AVFormatContext **outputList = new AVFormatContext*[outputCount];
@ -225,16 +225,15 @@ Stream *ExtractSubtitles(const char *path, const char *outPath, int *streamCount
else else
{ {
//Get metadata for file name //Get metadata for file name
Stream stream(NULL, //title streams[i] = Stream(NULL, //title
av_dict_get(inputStream->metadata, "language", NULL, 0)->value, //language av_dict_get(inputStream->metadata, "language", NULL, 0)->value, //language
avcodec_get_name(inputCodecpar->codec_id), //format avcodec_get_name(inputCodecpar->codec_id), //format
inputStream->disposition & AV_DISPOSITION_DEFAULT, //isDefault inputStream->disposition & AV_DISPOSITION_DEFAULT, //isDefault
inputStream->disposition & AV_DISPOSITION_FORCED, //isForced inputStream->disposition & AV_DISPOSITION_FORCED); //isForced
NULL); //Path builder references
//Create the language subfolder //Create the language subfolder
std::stringstream outStream; std::stringstream outStream;
outStream << outPath << (char)std::filesystem::path::preferred_separator << stream.language; outStream << outPath << (char)std::filesystem::path::preferred_separator << streams[i].language;
std::filesystem::create_directory(outStream.str()); std::filesystem::create_directory(outStream.str());
//Get file name //Get file name
@ -243,28 +242,27 @@ Stream *ExtractSubtitles(const char *path, const char *outPath, int *streamCount
fileName = fileName.substr(lastSeparator, fileName.find_last_of('.') - lastSeparator); fileName = fileName.substr(lastSeparator, fileName.find_last_of('.') - lastSeparator);
//Construct output file name //Construct output file name
outStream << fileName << "." << stream.language; outStream << fileName << "." << streams[i].language;
if (stream.isDefault) if (streams[i].isDefault)
outStream << ".default"; outStream << ".default";
if (stream.isForced) if (streams[i].isForced)
outStream << ".forced"; outStream << ".forced";
if (strcmp(stream.codec, "subrip") == 0) if (strcmp(streams[i].codec, "subrip") == 0)
outStream << ".srt"; outStream << ".srt";
else if (strcmp(stream.codec, "ass") == 0) else if (strcmp(streams[i].codec, "ass") == 0)
outStream << ".ass"; outStream << ".ass";
stream.path = _strdup(outStream.str().c_str()); streams[i].path = _strdup(outStream.str().c_str());
subtitleStreams[i] = stream;
*subtitleCount += 1; *subtitleCount += 1;
std::cout << "Stream #" << i << "(" << stream.language << "), stream type: " << inputCodecpar->codec_type << " codec: " << stream.codec << std::endl; std::cout << "Stream #" << i << "(" << streams[i].language << "), stream type: " << inputCodecpar->codec_type << " codec: " << streams[i].codec << std::endl;
AVFormatContext *outputContext = NULL; AVFormatContext *outputContext = NULL;
if (avformat_alloc_output_context2(&outputContext, NULL, NULL, stream.path) < 0) if (avformat_alloc_output_context2(&outputContext, NULL, NULL, streams[i].path) < 0)
{ {
std::cout << "Error: Couldn't create an output file." << std::endl; std::cout << "Error: Couldn't create an output file." << std::endl;
continue; continue;
@ -276,9 +274,9 @@ Stream *ExtractSubtitles(const char *path, const char *outPath, int *streamCount
if (outputStream == NULL) if (outputStream == NULL)
goto end; goto end;
av_dump_format(outputContext, 0, stream.path, true); av_dump_format(outputContext, 0, streams[i].path, true);
if (open_output_file_for_write(outputContext, stream.path) != 0) if (open_output_file_for_write(outputContext, streams[i].path) != 0)
goto end; goto end;
outputList[i] = outputContext; outputList[i] = outputContext;
@ -317,9 +315,7 @@ Stream *ExtractSubtitles(const char *path, const char *outPath, int *streamCount
process_packet(pkt, inputStream, outputStream); process_packet(pkt, inputStream, outputStream);
if (av_interleaved_write_frame(outputContext, &pkt) < 0) if (av_interleaved_write_frame(outputContext, &pkt) < 0)
{
std::cout << "Error while writing a packet to the output file." << std::endl; std::cout << "Error while writing a packet to the output file." << std::endl;
}
av_packet_unref(&pkt); av_packet_unref(&pkt);
} }
@ -341,24 +337,10 @@ Stream *ExtractSubtitles(const char *path, const char *outPath, int *streamCount
} }
delete[] outputList; delete[] outputList;
return subtitleStreams; return streams;
} }
void FreeMemory(Stream *streamsPtr) void FreeMemory(Stream *streamsPtr)
{ {
delete[] streamsPtr; delete[] streamsPtr;
}
Stream *TestMemory(const char *path, const char *outPath, int *streamCount, int *subtitleCount)
{
*streamCount = 4;
*subtitleCount = 2;
Stream *streams = new Stream[*streamCount];
streams[0] = Stream(NULL, NULL, NULL, NULL, NULL, NULL);
streams[1] = Stream(NULL, "eng", "ass", false, false, NULL);
streams[2] = Stream(NULL, NULL, NULL, NULL, NULL, NULL);
streams[3] = Stream(NULL, "fre", "ass", false, false, NULL);
return streams;
} }

9
Kyoo/InternalAPI/Crawler/Crawler.cs
View File

@ -150,10 +150,13 @@ namespace Kyoo.InternalAPI
if (!FindExtractedSubtitles(episode)) if (!FindExtractedSubtitles(episode))
{ {
Track[] tracks = transcoder.ExtractSubtitles(episode.Path); Track[] tracks = transcoder.ExtractSubtitles(episode.Path);
foreach (Track track in tracks) if (tracks != null)
{ {
track.episodeID = episode.id; foreach (Track track in tracks)
libraryManager.RegisterTrack(track); {
track.episodeID = episode.id;
libraryManager.RegisterTrack(track);
}
} }
} }
} }

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

@ -42,13 +42,15 @@ namespace Kyoo.InternalAPI.TranscoderLink
j++; j++;
} }
streamsPtr += size; streamsPtr += size;
Debug.WriteLine("&Stream got: " + stream.Language);
} }
} }
else else
tracks = null; tracks = null;
FreeMemory(ptr); FreeMemory(ptr);
Debug.WriteLine("&One loop done"); Debug.WriteLine("&File done: " + path);
} }
[DllImport(TranscoderPath, CallingConvention = CallingConvention.Cdecl)] [DllImport(TranscoderPath, CallingConvention = CallingConvention.Cdecl)]