openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1004 from OpenShot/360-spherical

Browse Source 
360 spherical video metadata + projection effect
This commit is contained in:
Jonathan Thomas
2025-05-23 22:22:07 -05:00
committed by GitHub
parent 1af80cc22b ec890fe74d
commit ea74c500a0
17 changed files with 864 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/FFmpegReader.cpp
View File

@@ -554,28 +554,49 @@ void FFmpegReader::Open() {
info.metadata[str_key.toStdString()] = str_value.trimmed().toStdString();
}
// If "rotate" isn't already set, extract it from the video stream's side data.
// TODO: nb_side_data is depreciated, and I'm not sure the preferred way to do this
if (info.metadata.find("rotate") == info.metadata.end()) {
for (unsigned int i = 0; i < pFormatCtx->nb_streams; i++) {
if (pFormatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
for (int j = 0; j < pFormatCtx->streams[i]->nb_side_data; j++) {
// Get the j-th side data element.
AVPacketSideData *sd = &pFormatCtx->streams[i]->side_data[j];
#pragma GCC diagnostic pop
if (sd->type == AV_PKT_DATA_DISPLAYMATRIX && sd->size >= 9 * sizeof(int32_t)) {
double rotation = -av_display_rotation_get(reinterpret_cast<int32_t *>(sd->data));
if (isnan(rotation))
rotation = 0;
QString str_value = QString::number(rotation, 'g', 6);
info.metadata["rotate"] = str_value.trimmed().toStdString();
break;
}
// Process video stream side data (rotation, spherical metadata, etc)
for (unsigned int i = 0; i < pFormatCtx->nb_streams; i++) {
AVStream* st = pFormatCtx->streams[i];
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
// Only inspect the first video stream
for (int j = 0; j < st->nb_side_data; j++) {
AVPacketSideData *sd = &st->side_data[j];
// Handle rotation metadata (unchanged)
if (sd->type == AV_PKT_DATA_DISPLAYMATRIX &&
sd->size >= 9 * sizeof(int32_t) &&
!info.metadata.count("rotate"))
{
double rotation = -av_display_rotation_get(
reinterpret_cast<int32_t *>(sd->data));
if (std::isnan(rotation)) rotation = 0;
info.metadata["rotate"] = std::to_string(rotation);
}
// Handle spherical video metadata
else if (sd->type == AV_PKT_DATA_SPHERICAL) {
// Always mark as spherical
info.metadata["spherical"] = "1";
// Cast the raw bytes to an AVSphericalMapping
const AVSphericalMapping* map =
reinterpret_cast<const AVSphericalMapping*>(sd->data);
// Projection enum → string
const char* proj_name = av_spherical_projection_name(map->projection);
info.metadata["spherical_projection"] = proj_name
? proj_name
: "unknown";
// Convert 16.16 fixed-point to float degrees
auto to_deg = [](int32_t v){
return (double)v / 65536.0;
};
info.metadata["spherical_yaw"] = std::to_string(to_deg(map->yaw));
info.metadata["spherical_pitch"] = std::to_string(to_deg(map->pitch));
info.metadata["spherical_roll"] = std::to_string(to_deg(map->roll));
}
break; // Only process the first video stream.
}
break;
}
}