1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
Source: Mandriva patch
Upstream: No bug report on bugs.kde.org
Reason: libstreamanalyzer uses deprecated symbols from ffmpeg removed in 0.11
--- strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.bero 2012-06-08 16:49:40.846877030 +0200
+++ strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2012-06-08 17:27:40.416888115 +0200
@@ -305,13 +305,6 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
uint8_t pDataBuffer[32768];//65536];
long lSize = 32768;
- ByteIOContext ByteIOCtx;
- if(init_put_byte(&ByteIOCtx, pDataBuffer, lSize, 0, in, read_data, NULL, seek_data) < 0)
- return -1;
-
- //pAVInputFormat->flags |= AVFMT_NOFILE;
- ByteIOCtx.is_streamed = 0;
-
AVProbeData pd;
const char *buf;
pd.filename ="";
@@ -324,14 +317,27 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
if(fmt == NULL)
return 1;
- AVFormatContext *fc = NULL;
- if(av_open_input_stream(&fc, &ByteIOCtx, "", fmt, NULL) < 0)
+ AVFormatContext *fc = avformat_alloc_context();
+ if(!fc)
+ return -1;
+
+ AVIOContext *pb = avio_alloc_context(pDataBuffer, lSize, 0, in, read_data, NULL, seek_data);
+ if(!fc->pb) {
+ av_free(fc);
return -1;
+ }
+
+ fc->pb = pb;
+
+ if(avformat_open_input(&fc, "", fmt, NULL) < 0) {
+ av_free(fc);
+ return -1;
+ }
- av_find_stream_info(fc);
+ avformat_find_stream_info(fc, NULL);
// Dump information about file onto standard error
- dump_format(fc, 0, ar.path().c_str(), false);
+ av_dump_format(fc, 0, ar.path().c_str(), false);
if(fc->bit_rate)
ar.addValue(factory->bitrateProperty, fc->bit_rate);
@@ -372,10 +378,10 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
ar.addTriplet(streamuri, durationPropertyName,outs.str());
}
- //FIXME we must stop using the deprecated fuction av_metadata_get and use
+ //FIXME we must stop using the deprecated fuction av_dict_get and use
// av_dict_get once we are able to detect the version of FFMpeg being used
// using version macros. same goes for all occurences of this function.
- AVMetadataTag *entry = av_metadata_get(stream.metadata, "language", NULL, 0);
+ AVDictionaryEntry *entry = av_dict_get(stream.metadata, "language", NULL, 0);
if (entry != NULL) {
const char *languageValue = entry->value;
if (size_t len = strlen(languageValue)) {
@@ -430,7 +436,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
outs << codec.sample_rate;
ar.addTriplet(streamuri, sampleratePropertyName, outs.str());
}
- if (codec.sample_fmt != SAMPLE_FMT_NONE) {}//FIXME sample format
+ if (codec.sample_fmt != AV_SAMPLE_FMT_NONE) {}//FIXME sample format
} else { // video stream
@@ -469,7 +475,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
// Tags
- AVMetadataTag *entry = av_metadata_get(fc->metadata, "title", NULL, 0);
+ AVDictionaryEntry *entry = av_dict_get(fc->metadata, "title", NULL, 0);
if (entry != NULL)
{
const char *titleValue = entry->value;
@@ -478,7 +484,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
}
}
- entry = av_metadata_get(fc->metadata, "author", NULL, 0);
+ entry = av_dict_get(fc->metadata, "author", NULL, 0);
if (entry != NULL)
{
const char *authorValue = entry->value;
@@ -490,7 +496,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
}
}
- entry = av_metadata_get(fc->metadata, "copyright", NULL, 0);
+ entry = av_dict_get(fc->metadata, "copyright", NULL, 0);
if (entry != NULL)
{
const char *copyrightValue = entry->value;
@@ -499,7 +505,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
}
}
- entry = av_metadata_get(fc->metadata, "comment", NULL, 0);
+ entry = av_dict_get(fc->metadata, "comment", NULL, 0);
if (entry != NULL)
{
const char *commentValue = entry->value;
@@ -508,7 +514,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
}
}
- entry = av_metadata_get(fc->metadata, "album", NULL, 0);
+ entry = av_dict_get(fc->metadata, "album", NULL, 0);
if (entry != NULL)
{
const char *albumValue = entry->value;
@@ -520,7 +526,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
}
}
- entry = av_metadata_get(fc->metadata, "genre", NULL, 0);
+ entry = av_dict_get(fc->metadata, "genre", NULL, 0);
if (entry != NULL)
{
const char *genreValue = entry->value;
@@ -529,7 +535,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
}
}
- entry = av_metadata_get(fc->metadata, "track", NULL, 0);
+ entry = av_dict_get(fc->metadata, "track", NULL, 0);
if (entry != NULL)
{
const char *trackValue = entry->value;
@@ -538,7 +544,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
}
}
- entry = av_metadata_get(fc->metadata, "year", NULL, 0);
+ entry = av_dict_get(fc->metadata, "year", NULL, 0);
if (entry != NULL)
{
const char *yearValue = entry->value;
@@ -547,7 +553,8 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
}
}
- av_close_input_stream(fc);
+ avformat_close_input(&fc);
+ av_free(pb);
//url_fclose(&ByteIOCtx);
return 0;
|
GitWeb