Review of chapter 2

This commit is contained in:
jfmcarreira committed 2018-07-30 15:38:33 +01:00
1 parent f3f362359e
commit 74109b2c4c
31 files changed
+751 -352

No files matched your search

@@ -1,4 +1,4 @@
\usetikzlibrary{arrows,matrix}
\usetikzlibrary{fit}
\usetikzlibrary{intersections}
@@ -86,46 +86,62 @@
% \path[arrow] (ConcOpt.east |- Signalling) -- (Signalling) node[above, pos=.45, yshift=-1] {\scriptsize M1...M4};
%
\node [propBlock, text width=2cm, right=2 of Encoder, yshift=-1.3cm] (Parser) {Stream Parser};
\path[MainArrow] (Encoder -| Parser) node[point] {} -- (Parser);
\node [propBlock, minimum height=.8cm, text width=2cm, right=2 of Encoder, yshift=-1cm] (StreamParser) {Stream Parser};
\path[MainArrow] (Encoder -| StreamParser) node[point] {} -- (StreamParser);
\node [propBlock, minimum height=.8cm, text width=2cm, below=.3 of StreamParser] (VideoParser) {Video analyser};
%% Input
\begin{scope}[xshift=-2.5cm, yshift=4cm]
\def\spacing{.2}
\coordinate(Input) at (0.5,0.3);
\foreach \i in {0,...,3}
\draw[thick,fill=\TikZColorFill] (\spacing*\i,-.15*\i) rectangle ++(1,1);
% \node[text width=.7cm, text centered] at (1.6,1.1) {Video Stream};
\node[text width=.7cm, text centered] at (1.1,.1) {Input video};
\end{scope}
% \begin{scope}[xshift=-2.5cm, yshift=4cm]
% \def\spacing{.2}
% \coordinate(Input) at (0.5,0.3);
% \foreach \i in {0,...,3}
% \draw[thick,fill=\TikZColorFill] (\spacing*\i,-.15*\i) rectangle ++(1,1);
% % \node[text width=.7cm, text centered] at (1.6,1.1) {Video Stream};
% \node[text width=.7cm, text centered] at (1.1,.1) {Input video};
% \end{scope}
% \path[MainArrow, shorten <=.9cm] (Input) |- (Encoder);
% \path[MainArrow] (Input |- EXP) node[point] {} |- (EXP);
% \path[MainArrow, shorten <=1.2cm] (Input.east |- ConcOpt) -- (ConcOpt);
% \node[text width=.5cm, text centered] at (-2,5.5) (Input) {Input video};
\path[MainArrow, shorten <=.9cm] (Input) |- (Encoder);
\node[text width=.7cm, text centered] (Input) at (-2,4.3) {Input video};
\path[MainArrow] (Input |- Encoder) node[point] {} |- (VideoParser);
\path[MainArrow] (Input) |- (Encoder);
\path[MainArrow] (Input |- EXP) node[point] {} |- (EXP);
% \path[MainArrow] (Input |- ConcOpt) node[point] {} |- (ConcOpt);
\path[MainArrow, shorten <=1.2cm] (Input.east |- ConcOpt) -- (ConcOpt);
\path[MainArrow] (Input.east |- ConcOpt) -- (ConcOpt);
%
% %% TS Mux and output
\path (Encoder.south) -- (Encoder |- ConcOpt.north) node[midway] (middleRef) {}; % Find middle ref
\node [propBlock, right=9.5 of middleRef, text width=5.5cm, rotate=-90, anchor=center, minimum height=1cm] (Mux) {Optimal robust coding selection};
\node [right of=Mux, node distance=2.5cm, coordinate] (Out) {};
\node [propBlock, right=9 of middleRef, text width=5.5cm, rotate=-90, anchor=center, minimum height=1.1cm] (Mux) {Error robustness optimisation};
\node [right of=Mux, node distance=2.8cm, coordinate] (Out) {};
\tikzstyle{OutputLabels} = [pos=1, anchor=south east, text width=2cm, align=right]
\path[MainArrow] (Encoder) -- (Mux.south |- Encoder) node[OutputLabels] {\textit{Stream\_1}};
\path[MainArrow] (EXP) -- (Mux.south |- EXP) node[OutputLabels] {\textit{Stream\_2}};
\path[MainArrow] (Scalable1) -- (Mux.south |- Scalable1) node[OutputLabels] {\textit{Stream\_3}};
\path[MainArrow] (Scalable0) -- (Mux.south |- Scalable0) node[OutputLabels] {\textit{Stream\_4}};
\path[MainArrow] (Encoder) -- (Mux.south |- Encoder) node[OutputLabels] {{S1}};
\path[MainArrow] (EXP) -- (Mux.south |- EXP) node[OutputLabels] {{S2}};
\path[MainArrow] (Scalable1) -- (Mux.south |- Scalable1) node[OutputLabels] {{S3}};
\path[MainArrow] (Scalable0) -- (Mux.south |- Scalable0) node[OutputLabels] {{S4}};
\path[MainArrow] (Mux) -- (Out) node[above, midway, text width=2cm, text centered] {Optimal \\ Robust Steam};
\path[SignallArrow] (Parser) -| (Mux.-7);
\path[SignallArrow] (Input |- Encoder) node[point] {} -- ++(0,-2) -| (Mux.0);
\node [text centered, text width=1.5cm, minimum height=1cm, below=.3 of Mux.east, xshift=1.9cm] (Channel) {Channel Conditions};
% \path[SignallArrow] (StreamParser.9) -| (Mux.-12);
% \path[SignallArrow] (StreamParser.0) -| (Mux.-8);
% \path[SignallArrow] (StreamParser.-9) -| (Mux.-4);
% \path[SignallArrow] (VideoParser.7) -| (Mux.2);
% \path[SignallArrow] (VideoParser.-7) -| (Mux.6);
% \path[SignallArrow] (Channel) -| (Mux.12);
\path[SignallArrow] (StreamParser) -| (Mux.-6) node (b1) [pos=.3, anchor=center] {\footnotesize /} node[right=-.2 of b1, yshift=-6, inner sep=0] {\footnotesize 3};
\path[SignallArrow] (VideoParser) -| (Mux.0) node (b2) at( b1 |- VideoParser) [anchor=center] {\footnotesize /} node[right=-.2 of b2, yshift=-6, inner sep=0] {\footnotesize 2};
\path[SignallArrow] (Channel) -| (Mux.6);
% \node at ($ (ah) - (0.55, 0) $) {\scriptsize /};
\node [text centered, text width=1.5cm, minimum height=1cm, below=.3 of Mux.east, xshift=1.5cm] (Channel) {Channel Conditions};
\path[SignallArrow] (Channel) -| (Mux.7);
\end{tikzpicture}
@@ -1,6 +1,5 @@
\def\layersep{3cm}
\begin{tikzpicture}[shorten >=1pt,->, node distance=\layersep]
\def\layersep{3cm}
\begin{tikzpicture}[shorten >=1pt,->, node distance=\layersep,font=\small]
\tikzstyle{neuron}=[circle,fill=black!25,minimum size=17pt,inner sep=0pt]
\tikzstyle{input neuron}=[neuron, fill=\TikZColorFillDark];
\tikzstyle{hidden neuron}=[neuron, fill=\TikZColorFill];
@@ -8,31 +7,39 @@
\tikzstyle{annot} = [text width=4em, text centered]
% Draw the hidden layer nodes
\foreach \name / \y in {1,...,6}
\path[yshift=0.5cm]
node[hidden neuron] (H-\name) at (\layersep,-\y cm) {};
\foreach \hidden / \y in {1,2,3,4,6}
\path[yshift=0cm] node[hidden neuron] (H-\hidden) at (\layersep,-\y cm) {};
\path[yshift=0cm] node[rotate=90] (H-5) at (\layersep,-5 cm) {...};
\node[input neuron, pin={[pin edge={latex-,thick,black}]left:Input \#1}] (I-1) at (0,-1) {};
\node[input neuron, pin={[pin edge={latex-,thick,black}]left:Input \#2}] (I-2) at (0,-2) {};
\node[input neuron, pin={[pin edge={latex-,thick,black}]left:Input \#3}] (I-3) at (0,-3) {};
\node[input neuron, pin={[pin edge={latex-,thick,black}]left:Input \#4}] (I-4) at (0,-4) {};
\node[input neuron, pin={[pin edge={latex-,thick,black}]left:Input \#5}] (I-5) at (0,-5) {};
\node[input neuron, pin={[pin edge={latex-,thick,black}]left:SI}] (I-1) at (0,-1) {};
\node[input neuron, pin={[pin edge={latex-,thick,black}]left:TI}] (I-2) at (0,-2) {};
\node[input neuron, pin={[pin edge={latex-,thick,black}]left:Inter(\%)}] (I-3) at (0,-3) {};
\node[input neuron, pin={[pin edge={latex-,thick,black}]left:AVG\_MV}] (I-4) at (0,-4) {};
\node[input neuron, pin={[pin edge={latex-,thick,black}]left:Bitrate}] (I-5) at (0,-5) {};
\node[input neuron, pin={[pin edge={latex-,thick,black}]left:PLR}] (I-6) at (0,-6) {};
% Draw the output layer nodes
\foreach \name / \y in {1,...,4}
% This is the same as writing \foreach \name / \y in {1/1,2/2,3/3,4/4}
\node[output neuron, pin={[pin edge={-latex,thick,black}]right:M\y}] (O-\name) at (2*\layersep,-0.5-\y) {};
%\node[output neuron, pin={[pin edge={-latex,thick,black}]right:M\y}] (O-\name) at (2*\layersep,-0.5-\y) {};
\node[yshift=-1cm, output neuron] (O-\name) at (2*\layersep,-\y) {};
\node[yshift=-1cm,output neuron] (O-O) at (3*\layersep,-2.5) {};
% Connect every node in the input layer with every node in the hidden layer.
\foreach \source in {1,...,5}
\foreach \dest in {1,...,6}
\path (I-\source) edge (H-\dest);
\foreach \source in {1,...,6}
\foreach \hidden in {1,2,3,4,6}
\path (I-\source) edge (H-\hidden);
% Connect every node in the hidden layer with the output layer
\foreach \source in {1,...,6}
\foreach \hidden in {1,2,3,4,6}
\foreach \dest in {1,...,4}
\path (H-\source) edge (O-\dest);
\path (H-\hidden) edge (O-\dest);
\foreach \out in {1,...,4}
\path[draw] (O-\out) -- (O-O) node[pos=.3,above] {\scriptsize S\out};
\path[draw] (O-O) -- ++(1.5,0) node[pos=0, above, anchor=south west] {S1...S4};
% Annotate the layers
\node[annot,above of=H-1, node distance=.8cm] (hl) {Hidden};