Added support for binary data recordings #2481
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
tmatth
reviewed
Dec 7, 2020
| } else { | ||
| g_snprintf(filename, 256, "rec-%"SCNu64"-data", id); | ||
| } | ||
| rec->drc_file = g_strdup(filename); |
There was a problem hiding this comment.
nit: you could simplify this (and get rid of the intermediate filename buffer) with just:
if(filename_text != NULL) {
rec->drc_file = g_strdup_printf("%s-data", filename_text);
} else {
rec->drc_file = g_strdup_printf("rec-%"SCNu64"-data", id);
}
There was a problem hiding this comment.
Oh I wasn't aware of g_strdup_printf: since we do the same thing in a few other places as well (core and plugins), for the moment I'll keep this as it is, and then once we merge I'll change them all in a single commit. Thanks for the heads up!
tmatth
reviewed
Dec 7, 2020
| @@ -2073,8 +2130,7 @@ void janus_recordplay_update_recordings_list(void) { | |||
| *ext = '\0'; | |||
| const char *textcodec = janus_recordplay_parse_codec(recordings_path, | |||
| rec->drc_file, NULL, sizeof(NULL), NULL); | |||
| if(textcodec) | |||
| rec->textdata = TRUE; /* Binary recordings not supported yet */ | |||
| rec->textdata = textcodec && (!strcasecmp(textcodec, "text")); | |||
There was a problem hiding this comment.
nit: no need for the extra parentheses around !strcasecmp() here
There was a problem hiding this comment.
True, I just thought it made it less ambiguous.
tmatth
reviewed
Dec 7, 2020
tmatth
reviewed
Dec 9, 2020
|
Merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR expands on the effort made by @ricardo-salgado-tekever in #2468, and adds support for recording binary data channels too, rather than just text data channels. It also fixed a few other things I noticed.
In mjr files, binary recordings are now marked as "binary" (where text-based data channel recordings were already marked as "text"). Since there's no way to know what data is stored in those files and so we can't expect a specific extension for the destination file as we do for other formats, while text based data recordings are still converted to
.srtfiles, the postprocessor converts binary recordings to raw files instead: meaning that it will just extract the data from each packet, and append it one after the other in the file name you provide. This should be the easiest and simplest way of handling them, rather than ignoring them altogether.To test all this, I modified the Record&Play plugin to support saving data recordings as well (Ricardo's patch only added support for playout). To test this, you can add
?data=textor?data=binaryas a query string argument to therecordplaytest.htmldemo page, and the demo will show a text area where you can input some text: when you press enter, the message is sent to the plugin and saved to the file in the format you asked for. At the same time, the playout of a recording including data will render the messages in the same box (notice that binary data will simply be rendered as the presence of an ArrayBuffer object).This seems to be working fine in my setup: if you're using Record&Play in your applications, please test to ensure you don't encounter any regression. I plan to merge soon otherwise.